Both 7.3 releases need the cubeparse patch.

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

2 files changed, 16 insertions, 52 deletions

diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 16430a9df5c7..8cbfd320343b 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -14,14 +14,14 @@ AUX pg_autovacuum.init-8.0 1412 RMD160 e87f6294e1c566458da73630a1d4a2eb1669649f
 MD5 284f7a3f5cfa4fa411e13e60c633a1f3 files/pg_autovacuum.init-8.0 1412
 RMD160 e87f6294e1c566458da73630a1d4a2eb1669649f files/pg_autovacuum.init-8.0 1412
 SHA256 3ae8105f52afe90b04053e7ed83d6b05a71889bdf9013269c931f00208033c19 files/pg_autovacuum.init-8.0 1412
+AUX postgresql-7.3-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
+MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3-cubeparse.patch 1296
+RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3-cubeparse.patch 1296
+SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada files/postgresql-7.3-cubeparse.patch 1296
 AUX postgresql-7.3-gentoo.patch 1741 RMD160 15fdb099bbaa8c3fcf139c09a5bbccdeb5e31a41 SHA1 ee81ac8d96dd2e349de24c33a4816ff2598348bb SHA256 998d5feaaacb5b2bdf54dccaa22a947ede262c6e72ac884c11b42376c4f3d2ae
 MD5 24dbe742a511f6c7bba4cbd940c8c4b5 files/postgresql-7.3-gentoo.patch 1741
 RMD160 15fdb099bbaa8c3fcf139c09a5bbccdeb5e31a41 files/postgresql-7.3-gentoo.patch 1741
 SHA256 998d5feaaacb5b2bdf54dccaa22a947ede262c6e72ac884c11b42376c4f3d2ae files/postgresql-7.3-gentoo.patch 1741
-AUX postgresql-7.3.15-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
-MD5 5d36c9cda475e2aaf9609655dfb44ac1 files/postgresql-7.3.15-cubeparse.patch 1296
-RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 files/postgresql-7.3.15-cubeparse.patch 1296
-SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada files/postgresql-7.3.15-cubeparse.patch 1296
 AUX postgresql-7.4-gentoo.patch 1741 RMD160 202f7c21d984a45a1adec0ac92ae727bd75535c6 SHA1 205293bd138db9948220cbcdc401f202eb9814a5 SHA256 9bd9fefdb9d5d8a62ec00c8ac0175322ae66ca860c3571593fea81ffd4add8dc
 MD5 048439fadb678ce304dec9629829bcc2 files/postgresql-7.4-gentoo.patch 1741
 RMD160 202f7c21d984a45a1adec0ac92ae727bd75535c6 files/postgresql-7.4-gentoo.patch 1741
@@ -99,14 +99,14 @@ DIST postgresql-opt-7.3.15.tar.bz2 341753 RMD160 8057276fff0ae87f49fb4853e6f3df6
 DIST postgresql-opt-7.4.13.tar.bz2 333860 RMD160 9fd1caacd6d842a473725450a0973173f68ae7b8 SHA1 79455e60f074a488ab3abafd10bfce4c63b33293 SHA256 8139a7161b2a55eba304b027896f0bfc81523dd41f7d1df222274b7a55e5aeab
 DIST postgresql-opt-8.0.8.tar.bz2 134600 RMD160 352f07aa25d0dcf1d2e3502f5cec7295c40bc3d5 SHA1 081d0b8d755a49395001b46ca0585c4e2b5ecf4f SHA256 427e82253b068b35e47235a1b78c521c89a9774b80dcc2433946f86220a34926
 DIST postgresql-opt-8.1.4.tar.bz2 144696 RMD160 8f25c6137a8cbd786a647cf4d8ef59c95573012d SHA1 ba8ed68da796e67858f7c100f6d64f1586540f05 SHA256 5a6d27e303ad9b073f91e51658b13cfeb153e3d886af5e5c1093ea315e15738c
-EBUILD postgresql-7.3.11.ebuild 8348 RMD160 7dc251351e4ffd839033a28bf4ebcbf5f11e8a4f SHA1 0d576536bbcee24fb3c53891269da464ea0faefa SHA256 0820cd2d839f5fb4a67f75578aae4d4336607ebfcb4e42813d42524b5366f108
-MD5 ad3c4faddadea446bd36cb60c74ef334 postgresql-7.3.11.ebuild 8348
-RMD160 7dc251351e4ffd839033a28bf4ebcbf5f11e8a4f postgresql-7.3.11.ebuild 8348
-SHA256 0820cd2d839f5fb4a67f75578aae4d4336607ebfcb4e42813d42524b5366f108 postgresql-7.3.11.ebuild 8348
-EBUILD postgresql-7.3.15-r1.ebuild 8511 RMD160 0d0e07fd36a84a5aae53dee34222a0e7aee9c491 SHA1 dcdcc8f7ba7871f2c996a0a3840151a48932c17f SHA256 177be9839f407de7870f623d2b7a8fab76f4d5a10064819b773512439d46df26
-MD5 a6bfb8a82fe0b64230442567e2264163 postgresql-7.3.15-r1.ebuild 8511
-RMD160 0d0e07fd36a84a5aae53dee34222a0e7aee9c491 postgresql-7.3.15-r1.ebuild 8511
-SHA256 177be9839f407de7870f623d2b7a8fab76f4d5a10064819b773512439d46df26 postgresql-7.3.15-r1.ebuild 8511
+EBUILD postgresql-7.3.11.ebuild 8401 RMD160 587943314f9b1af244247efab68029388eee9e09 SHA1 5cfd28d387a74bcb919d52fcbe76c4b553c0232e SHA256 f0d3f2d172a07d888455c358b525493bb15fe97577b604f258630a1d046742a1
+MD5 c540c692fbdd4385ccdd4e4aec09aae5 postgresql-7.3.11.ebuild 8401
+RMD160 587943314f9b1af244247efab68029388eee9e09 postgresql-7.3.11.ebuild 8401
+SHA256 f0d3f2d172a07d888455c358b525493bb15fe97577b604f258630a1d046742a1 postgresql-7.3.11.ebuild 8401
+EBUILD postgresql-7.3.15-r1.ebuild 8514 RMD160 930d79a86c600a23cbdd2d39c498a026a8cee102 SHA1 068084a34cd021502775bb7b291e8994b4794d36 SHA256 fe4b1a3ef975744b840bca7e30d821954c43fd3d673e0ba051fae03302ecfc17
+MD5 2a983db5d8b0808275c1f72c2de327c8 postgresql-7.3.15-r1.ebuild 8514
+RMD160 930d79a86c600a23cbdd2d39c498a026a8cee102 postgresql-7.3.15-r1.ebuild 8514
+SHA256 fe4b1a3ef975744b840bca7e30d821954c43fd3d673e0ba051fae03302ecfc17 postgresql-7.3.15-r1.ebuild 8514
 EBUILD postgresql-7.4.13.ebuild 10693 RMD160 f97311b69d04a1678d9841039c6231c35541b4fb SHA1 a7105807b9ccec595879591370c029bcdc144d80 SHA256 fc9c0d89fa011c688b04b8bffce912b050bbb2f9994af52fe9a0bc5b0bfe1ffa
 MD5 1d77d6d9067b80d60ebf43a47fb2b354 postgresql-7.4.13.ebuild 10693
 RMD160 f97311b69d04a1678d9841039c6231c35541b4fb postgresql-7.4.13.ebuild 10693
@@ -119,10 +119,10 @@ EBUILD postgresql-8.1.4.ebuild 7743 RMD160 ffc6909b4c6c681f3d738f629da59288ba520
 MD5 d9cc36dfcaa0734dd891473f9514d063 postgresql-8.1.4.ebuild 7743
 RMD160 ffc6909b4c6c681f3d738f629da59288ba520639 postgresql-8.1.4.ebuild 7743
 SHA256 88c47cc67a82754ef64b414e59b26e391c21f7cbe4a73e78125da2fecda3af12 postgresql-8.1.4.ebuild 7743
-MISC ChangeLog 61246 RMD160 fe9adf28de3783cbb72f2ac93ed5155656791492 SHA1 2dcbf9d74577f94587cc2e115546f1aec2967dda SHA256 6392b0db733eb0baedcf3ba920c7e3b8a3bba0939dde7e7af6bfe3381c6b77e2
-MD5 e443bd9f6b9a6eb3b2c7cb89c8a5a2df ChangeLog 61246
-RMD160 fe9adf28de3783cbb72f2ac93ed5155656791492 ChangeLog 61246
-SHA256 6392b0db733eb0baedcf3ba920c7e3b8a3bba0939dde7e7af6bfe3381c6b77e2 ChangeLog 61246
+MISC ChangeLog 61510 RMD160 fdbc58af728433ecab87026fe345a25d89c42ace SHA1 ff7ff0778b218ba593e6ea9a69b5789f3111518c SHA256 f9491ce39f2199fb6336d71f31ed60eb443398ef0eb2dae89535afa606bcbee6
+MD5 1ff60ce5848e2cf211b5b6633a1d61fc ChangeLog 61510
+RMD160 fdbc58af728433ecab87026fe345a25d89c42ace ChangeLog 61510
+SHA256 f9491ce39f2199fb6336d71f31ed60eb443398ef0eb2dae89535afa606bcbee6 ChangeLog 61510
 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/postgresql/files/postgresql-7.3.15-cubeparse.patch b/dev-db/postgresql/files/postgresql-7.3.15-cubeparse.patch
deleted file mode 100644
index 705e073c8e45..000000000000
--- a/dev-db/postgresql/files/postgresql-7.3.15-cubeparse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- contrib/cube/cubescan.l.orig	2006-07-05 06:56:04.000000000 +0000
-+++ contrib/cube/cubescan.l	2006-07-05 06:56:12.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int cube_yylex YY_PROTO(( void )); \
- int cube_yylex YY_PROTO(( void ))
- #define yylval cube_yylval
---- contrib/seg/segscan.l.orig	2006-07-05 07:08:26.000000000 +0000
-+++ contrib/seg/segscan.l	2006-07-05 07:08:51.000000000 +0000
-@@ -9,6 +9,10 @@
- 
- 
- /* flex screws a couple symbols when used with the -P option; fix those */
-+#ifndef YY_PROTO
-+#define YY_PROTO(proto) proto
-+#endif
-+
- #define YY_DECL int seg_yylex YY_PROTO(( void )); \
- int seg_yylex YY_PROTO(( void ))
- #define yylval seg_yylval
---- contrib/tsearch/parser.l.orig	2006-07-05 07:22:36.000000000 +0000
-+++ contrib/tsearch/parser.l	2006-07-05 07:23:33.000000000 +0000
-@@ -18,6 +18,7 @@
- char *s     = NULL;  /* to return WHOLE hyphenated-word */
- 
- YY_BUFFER_STATE buf = NULL; /* buffer to parse; it need for parse from string */
-+static YY_BUFFER_STATE yy_current_buffer = 0;
- 
- int lrlimit = -1;	/* for limiting read from filehandle ( -1 - unlimited read ) */
- int bytestoread = 0;	/* for limiting read from filehandle */