dev-db/postgresql-server: Removed oid2name since installed by postgresql-base.

svn path=/experimental/; revision=328

4 files changed, 17 insertions, 5 deletions

diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index ccb6276..1e947b9 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-server-8.0.15.ebuild, files/postgresql-8.3-server.patch:
+  Removed oid2name since installed by postgresql-base.
+
   10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-server-7.3.21.ebuild:
   Disabled horology test since it's too unreliable.
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 1b30b02..e4955ba 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -13,7 +13,7 @@ AUX postgresql-8.1-server.patch 6471 RMD160 6670d072e6ec4b536b9a5aa9cea8f6c02f20
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
 AUX postgresql-8.2-server.patch 4849 RMD160 a1f625e9d0d19acaae63e75084185e32623dbcf6 SHA1 a481e9500cc8484a1bc454820aae5b8603451ba2 SHA256 be4ccf88103e92c5adcb065d3aaf10b9e60fad1962993d255965a6260ea3f595
 AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
-AUX postgresql-8.3-server.patch 5716 RMD160 cb9f225c326a6da9aecebc96b32f608353b8c9c1 SHA1 8a29f0103d11e7f9288883f9ebde2053678dc14d SHA256 4631ff39254285863ebf6bc2877f20a2de7d440b9943953e1d0d62c34e793b1c
+AUX postgresql-8.3-server.patch 5798 RMD160 a91841ff9a3446d276839bb4bbac1716002c8c9a SHA1 8519967bbc3f3ae0dc8f12089e3580ee79015290 SHA256 91a8b73a4eb917af1e3ecf32baf8b26ec2b861d94b1319ce356132252a23de5b
 AUX postgresql.conf-7.3 1515 RMD160 d2a5175d176bb1039a195c61762464769e86266a SHA1 7b33b242c5aa39bb56917b216aa7495c8cb3d100 SHA256 9e93fe9780bea82c9ef31f311cb556737aa940f749edf3d2a7f8dc36e12e93a4
 AUX postgresql.conf-7.4 1515 RMD160 6e5ffcdc845b13061a565021d09926f7fcf63c94 SHA1 ca6f8a32c6d91bc57336930b1f91feb5cd4c0fdb SHA256 9aeb9dae2e058804fd3e821b10cf620dc9cbd54cae94f8bc5eb34950badd4125
 AUX postgresql.conf-8.0 1515 RMD160 e866990bd42af8941f95bec7df1a325aff5f89b6 SHA1 ab7aee171705e3f74c93014d5519569fcc9a885e SHA256 68044a2a7e000691b2ed0995b3176c0b5507af1e9a395b24d104c16c66ad7d42
@@ -34,9 +34,9 @@ DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc7
 DIST postgresql-8.3.0.tar.bz2 13923051 RMD160 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e SHA1 b221e9a82fdb10af1a2b527551a4e30b7ccb958d SHA256 85356d6ab577e21bb528eb5d672e4373b21fe98ac046e77a0eed975608066ea6
 EBUILD postgresql-server-7.3.21.ebuild 7852 RMD160 2b720d8755997b38b63fe2cc3f1031516a3f9247 SHA1 501e37a5150afc25ba31cedbcbcfdc0d9e381acd SHA256 a533e66d76167651c8f4cdee99654833b354871da6ba87654f8c24c31c12dbb4
 EBUILD postgresql-server-7.4.19.ebuild 7887 RMD160 4c86bde8a0c3f2a9e13a787bff905cfa51844eee SHA1 0a6f0b0e0c06f4f0874a1ca26aaa9cc30d12a598 SHA256 dfcb50e9f2c242776989fca1ad1a387bfd507b553fdab1ea8caad874ffc6515f
-EBUILD postgresql-server-8.0.15.ebuild 7871 RMD160 a0e91ac09d9e4aa867b29af6344add49c5349909 SHA1 b3aa41a1b27826781b82936080a919bc1c1a1d5d SHA256 d19cf8a866cef321e787b1be0bffb1d19b99efc39c14a2bd6a29a64859d53047
+EBUILD postgresql-server-8.0.15.ebuild 7964 RMD160 397145eeb96999e3b12c155ebd5c2a1c8d1d902a SHA1 ff5ac4fcefa8343801a3f6f00bb9276625d44202 SHA256 60bdb1943eb9c087adcecc52ca06d966e6add9e0415833a24d1fadff98b8e23b
 EBUILD postgresql-server-8.1.11.ebuild 8085 RMD160 771666b036943fbc53b9b4800d4d9dd90880df3b SHA1 ec961d4181e9cf7b124530fe116eb84b3723294c SHA256 4ff782645578eec0973a2cab43f38d1869ad03eed51bb8bcd1889cb512bbe5a6
 EBUILD postgresql-server-8.2.6.ebuild 8315 RMD160 b5f0e914376dcfd8001444ee27b3db122d6d662c SHA1 b8887bbd883bbd0a61c0895d80f912c39119ffc7 SHA256 fe1e5d006911b1c6d1488ab6722e6f5d645ff4b2064a21d72c7bf50b8fef64e5
 EBUILD postgresql-server-8.3.0.ebuild 8342 RMD160 9ab8df06fe652355c72ce76798344ca884ea1791 SHA1 77b14e5e7abcff65562016ad69e2415673e9cc02 SHA256 b671b01cd2adef914b7c0a69cbb58824db47ef6180bfce306d7832b8a6e93a53
-MISC ChangeLog 2762 RMD160 f193a87916c6e308baa14aad1158d77bc82abccf SHA1 b99d46e2579700f02f5c66b0173f0822419d2017 SHA256 04fa2a2927660eb89cd5b07d09cc0d3eb763d6f2787f9997683ce53860055483
+MISC ChangeLog 2941 RMD160 d916e094f6990050797083e68abf1b655e6cde44 SHA1 3e9a48b15726fa56c31ea5566929d68f1874d367 SHA256 6d36af1dcfddb13794cdd7b55787add1175dbf25195271aa42384fff07d6f7b2
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
index eeece0d..c8e6f0b 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -26,7 +26,13 @@
 ==================================================================
 --- contrib/Makefile	(revision 12)
 +++ contrib/Makefile	(local)
-@@ -26,16 +26,13 @@
+@@ -20,22 +20,18 @@
+ 		isn		\
+ 		lo		\
+ 		ltree		\
+-		oid2name	\
+ 		pageinspect	\
+ 		pg_buffercache	\
  		pg_freespacemap \
  		pg_standby	\
  		pg_trgm		\
diff --git a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
index fb3b6c1..c734d98 100644
--- a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
@@ -192,7 +192,9 @@ pkg_config() {
 }
 
 src_test() {
-	export LC_ALL="C"
+	sed -i \
+		-e '/test: horology/d' \
+		src/test/regress/{parallel_schedule,serial_schedule} || die "sed failed"
 
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \