dev-db/postgresql-server: A lot of /usr/lib -> /usr/ fixes. Removed chown and 'su -' lines from the patches since it makes tests fail when using paludis and a sane workaround is not possible atm.

svn path=/experimental/; revision=323
author: Tiziano Müller <dev-zero@gentoo.org> 2008-03-10 22:31:14 +0000
committer: Tiziano Müller <dev-zero@gentoo.org> 2008-03-10 22:31:14 +0000
commit: 7389839ac18be9c82dfd405ec51ea9805384e441 (patch)
tree: 5a6aac27e8498aec2cf0adbb43671992b1ca8fdd
parent: dev-db/postgresql-server: Changed some more dependencies on postgresql-libs t... (diff)
download: experimental-7389839ac18be9c82dfd405ec51ea9805384e441.tar.gz
experimental-7389839ac18be9c82dfd405ec51ea9805384e441.tar.bz2
experimental-7389839ac18be9c82dfd405ec51ea9805384e441.zip
14 files changed, 124 insertions, 122 deletions
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 6e87aa4..aaaa656 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -3,6 +3,17 @@
 # $Header: $
 
   10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postgresql-server-7.3.21.ebuild, files/postgresql-7.3-regress.patch,
+  postgresql-server-7.4.19.ebuild, files/postgresql-7.4-regress.patch,
+  postgresql-server-8.0.15.ebuild, files/postgresql-8.0-server.patch,
+  postgresql-server-8.1.11.ebuild, files/postgresql-8.1-server.patch,
+  postgresql-server-8.2.6.ebuild, files/postgresql-8.2-server.patch,
+  postgresql-server-8.3.0.ebuild, files/postgresql-8.3-server.patch:
+  A lot of /usr/lib -> /usr/ fixes. Removed chown and 'su -' lines from the
+  patches since it makes tests fail when using paludis and a sane workaround
+  is not possible atm.
+
+  10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   postgresql-server-7.3.21.ebuild, postgresql-server-7.4.19.ebuild,
   postgresql-server-8.0.15.ebuild, postgresql-server-8.1.11.ebuild:
   Changed some more dependencies on postgresql-libs to postgresql-base
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 739c7c1..aa3a086 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -1,19 +1,19 @@
 AUX postgresql-7.3-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
-AUX postgresql-7.3-regress.patch 3354 RMD160 9283301c6782048a5350c03194cf966318ff4399 SHA1 59d0997e2529a8416a72a71ff4005f31b780ceac SHA256 724e75da0aaf06f7ae51dd8c38601897ffcd3aca8d0755e07e91c2a71984271d
+AUX postgresql-7.3-regress.patch 3294 RMD160 babb74fa25f69bdc5b7a31fc590cc9b8c56b6cb8 SHA1 32be69b830f7fb93b39bba085a240a57b63ce16a SHA256 89f552ebe592677887c086b92c16104b7db47839ad889c3f91546191005d1016
 AUX postgresql-7.3-server.patch 2392 RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 SHA1 878478c8eac3949a217cce448eec418d93cda5ad SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821
 AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8
-AUX postgresql-7.4-regress.patch 3397 RMD160 59c5c292eab17cb358a498d4a9b408a118dedabc SHA1 27f2d2d07f8acb70b754a09efede17e9e69cf4ec SHA256 62ebfe599b75cadf6c967727da70cea1eca4b50fa0ba840cb57214270b02db1f
+AUX postgresql-7.4-regress.patch 3337 RMD160 dcd1eef99595c5ae070a6778179a1b4611810ad8 SHA1 b58a22970ff3f6c489e55fa6fc1f2a5ba27f1aec SHA256 0679c01c80b0a789789cc5e4b0317e3d8e1ec4acdbe1bd42b63eab37097fa872
 AUX postgresql-7.4-server.patch 2482 RMD160 8f5f4c5e07b8c2b9616a82dd97992f7e5da372b1 SHA1 24f1b2cd0b831766b2f9cb423707e16d1f75d2e7 SHA256 dafa7ecb1dbf033c484c0f8d0a77ec1bac10f1088c17086e344da4793814fee0
 AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123
 AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 SHA1 a42d03a9c4d7b5df7a69a3d23c9e527c6d901eba SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e
 AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
-AUX postgresql-8.0-server.patch 6585 RMD160 2ca5906bd037fa04bab36d4536ee1c1bc7777b99 SHA1 3e2b9e0eff38eb02a84e373808c5b94bf91f761d SHA256 8e956e5f483da78b341dd3b4faecfa4eb6506716b01f8a3bdc283c67ca0a9daf
+AUX postgresql-8.0-server.patch 6510 RMD160 d34a28d154a326b3407162f6227c2c03c4d65005 SHA1 b967366751958ad7502ce97da145d74e47e8cb36 SHA256 621a6f9f529b3318a8f7cc4e3cab7221185f4bd224f4387c13e386cf6b071ccc
 AUX postgresql-8.1-common.patch 2290 RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb8cf6 SHA1 facf27b2c396fe9f2347eb4cec3b2714a8587b70 SHA256 f80c8dd5a31b88df330c15de4331db1600ae078a789650ab28d61620f27056f5
-AUX postgresql-8.1-server.patch 6546 RMD160 62dcae54757e71616d9c9c37afde0ed3b0a53b28 SHA1 70afb0581a7916501faceb7aa793426ace3f9658 SHA256 82470c7156757fe5005d7ec6c3216f1b32f39d1344ddff012ff59e94e9893f14
+AUX postgresql-8.1-server.patch 6471 RMD160 6670d072e6ec4b536b9a5aa9cea8f6c02f20d196 SHA1 a944bf0717a8ea09c87562267057d3764ac4cfdd SHA256 a0f2c3ddc29b647321ce7ef3759c37423760a6f9edec7442bc9d0b9ad71ef090
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
-AUX postgresql-8.2-server.patch 4926 RMD160 362010d4ccf9efabdeeac1acc6a8d6c215d7a683 SHA1 0d2b93dda23f04d10976c9183f3d11be941748d0 SHA256 4c03ee3e8160a06e51c92dddd766d00a677d7d8e45a68ccdb0940612f5452de1
+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 5944 RMD160 a1e198aea16a19d21c454a3e9677a00751a9cf35 SHA1 a896132e246d973595dc6732492c3cd792372ccd SHA256 bb20ccecbab477315b7ee4c22a6f628e951aaa1c3ee0d36bb1771478ad59f348
+AUX postgresql-8.3-server.patch 5716 RMD160 cb9f225c326a6da9aecebc96b32f608353b8c9c1 SHA1 8a29f0103d11e7f9288883f9ebde2053678dc14d SHA256 4631ff39254285863ebf6bc2877f20a2de7d440b9943953e1d0d62c34e793b1c
 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
@@ -32,11 +32,11 @@ DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043a
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.2.6.tar.bz2 12559117 RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 SHA1 8934dfbd4c1d8c4f2945cb80f02072611681f967 SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114
 DIST postgresql-8.3.0.tar.bz2 13923051 RMD160 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e SHA1 b221e9a82fdb10af1a2b527551a4e30b7ccb958d SHA256 85356d6ab577e21bb528eb5d672e4373b21fe98ac046e77a0eed975608066ea6
-EBUILD postgresql-server-7.3.21.ebuild 7894 RMD160 53c2d0f08071ef0906cac1ff73634c574eb1bb7b SHA1 5b6ac4ff1574a96b0269fb40508e111300bdcdcf SHA256 874b31e9d38ddcb5660fc160d4eaeb1c4122596e5c628a6e5188589df202cb25
-EBUILD postgresql-server-7.4.19.ebuild 7797 RMD160 8a1b7d695be96c90d13fa87665da17ab719715ef SHA1 87e25b8b1a755afa4e51173d78abe80669063377 SHA256 491c5f7ef3211cdd86ba0f0e5323da66f5cb32e0ac12daf4e5ae2173e390897c
-EBUILD postgresql-server-8.0.15.ebuild 7801 RMD160 50505fd3f8da95f01858068fa273e21813784293 SHA1 50bc49c152bd0e82718fbd042696251f67d2a5c1 SHA256 0c01ad03a15598e59fc945a7bab7488468b2fd26c574aae834e68c8366e7e8c2
-EBUILD postgresql-server-8.1.11.ebuild 8035 RMD160 a863e7d80116e9503e682c1aa53a989c21556d99 SHA1 0f7c172e450712b709319e3e9fb938617d714c49 SHA256 2bbc1fb812b0e2902142909bb1c2cb1b6b3a9dc6a7ce4ba43a9252e330f2b6a6
-EBUILD postgresql-server-8.2.6.ebuild 8265 RMD160 9ee00bf7c6f8f31b292d068277db7ea492fb7d0d SHA1 5a716eaeb640cd29840b0f6adec56199fa5e1446 SHA256 c1de231ac851209f1592129da3ac1f8b2d7bd188a80730493a7929beebc30a4b
-EBUILD postgresql-server-8.3.0.ebuild 8292 RMD160 35acd5e06a12e8442640a6ef55e82b9db1083bde SHA1 860990af54e1e0a49b50c26f0d76bf4517836396 SHA256 0a856fe8aca5ecb7ec7bf1e47a196789e199c4e8fc4a496e44be1480a49e557a
-MISC ChangeLog 1860 RMD160 edfb77c6f9c003d5769ed5671d9941245c6dc92d SHA1 171f70f18c07c3513eeddd3bd9241ef8403711f3 SHA256 6119fbd0a41ce63094cee17659d532c1960777adea212f7d6c52a128be6226d5
+EBUILD postgresql-server-7.3.21.ebuild 7984 RMD160 9ebefde66d004de1574c3c78d4ee5d683c251d99 SHA1 b84a5d348d297298e70ba1664222c9382d2b7042 SHA256 56c5da9f03fd41a7270d3ccedd5ebaf6dbf448efe3b08084b53a9b245cfd964d
+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.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 2510 RMD160 be9b0b66b58df18bd5fcf9d39fb0244a96428300 SHA1 1bbdf0ff9b85dcad2f2ccd84a478951ad7c5e2ac SHA256 9a8d1fb86126c166290ae6a7bd449dd5ed2709753a614b8742bab99721be9ead
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/files/postgresql-7.3-regress.patch b/dev-db/postgresql-server/files/postgresql-7.3-regress.patch
index 992d09c..ce2258e 100644
--- a/dev-db/postgresql-server/files/postgresql-7.3-regress.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.3-regress.patch
@@ -2,13 +2,12 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index ebf14e5..bb07726 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -113,7 +113,8 @@ all-spi:
+@@ -113,7 +113,7 @@ all-spi:
  ##
  
  check: all
 -	$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE)
-+	chown portage .
-+	su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE)"
++	clientbindir="/usr/lib/postgresql-${SLOT}/bin" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE)
  
  installcheck: all
  	$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)
diff --git a/dev-db/postgresql-server/files/postgresql-7.4-regress.patch b/dev-db/postgresql-server/files/postgresql-7.4-regress.patch
index a8107d8..fbb7eac 100644
--- a/dev-db/postgresql-server/files/postgresql-7.4-regress.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.4-regress.patch
@@ -2,13 +2,12 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index 3d6a939..865351a 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -122,7 +122,8 @@ all-spi:
+@@ -122,7 +122,7 @@ all-spi:
  ##
  
  check: all
 -	$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT)
-+	chown portage .
-+	su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin/ PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT)"
++	clientbindir="/usr/lib/postgresql-${SLOT}/bin/" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT)
  
  installcheck: all
  	$(SHELL) ./pg_regress --schedule=$(srcdir)/serial_schedule --multibyte=$(MULTIBYTE)
diff --git a/dev-db/postgresql-server/files/postgresql-8.0-server.patch b/dev-db/postgresql-server/files/postgresql-8.0-server.patch
index 72e37eb..adf00fa 100644
--- a/dev-db/postgresql-server/files/postgresql-8.0-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.0-server.patch
@@ -132,13 +132,12 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index 822147b..f45ddee 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -138,7 +138,8 @@ all-spi:
+@@ -138,7 +138,7 @@ all-spi:
  check: all
  	-rm -rf ./testtablespace
  	mkdir ./testtablespace
 -	$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)
-+	chown portage testtablespace .
-+	su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin/ PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)"
++	clientbindir="/usr/lib/postgresql-${SLOT}/bin/" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)
  
  installcheck: all
  	-rm -rf ./testtablespace
diff --git a/dev-db/postgresql-server/files/postgresql-8.1-server.patch b/dev-db/postgresql-server/files/postgresql-8.1-server.patch
index 9f2c044..9ec3869 100644
--- a/dev-db/postgresql-server/files/postgresql-8.1-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.1-server.patch
@@ -121,13 +121,12 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index a384254..22f69f1 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -137,7 +137,8 @@ all-spi:
+@@ -137,7 +137,7 @@ all-spi:
  check: all
  	-rm -rf ./testtablespace
  	mkdir ./testtablespace
 -	$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
-+	chown portage testtablespace .
-+	su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin/ PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)"
++	clientbindir="/usr/lib/postgresql-${SLOT}/bin/" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
  
  installcheck: all
  	-rm -rf ./testtablespace
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-server.patch b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
index 0f39a63..92e9d36 100644
--- a/dev-db/postgresql-server/files/postgresql-8.2-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
@@ -132,13 +132,12 @@ diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
 index f2319d2..85aac4f 100644
 --- a/src/test/regress/GNUmakefile
 +++ b/src/test/regress/GNUmakefile
-@@ -148,7 +148,8 @@ all-spi:
+@@ -148,7 +148,7 @@ all-spi:
  check: all
  	-rm -rf ./testtablespace
  	mkdir ./testtablespace
 -	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)
-+	chown portage testtablespace .
-+	su -s /bin/sh portage -c "PATH=\"${PATH}\" ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) --psqldir=/usr/lib/postgresql-${SLOT}/bin/"
++	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
  
  installcheck: all
  	-rm -rf ./testtablespace
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 60433fe..eeece0d 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -1,8 +1,8 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index f7bcc67..ec8fcf1 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
+=== GNUmakefile.in
+==================================================================
+--- GNUmakefile.in	(revision 12)
++++ GNUmakefile.in	(local)
+@@ -11,19 +11,16 @@
  all:
  	$(MAKE) -C doc all
  	$(MAKE) -C src all
@@ -22,11 +22,11 @@ index f7bcc67..ec8fcf1 100644
  
  distprep:
  	$(MAKE) -C doc $@
-diff --git a/contrib/Makefile b/contrib/Makefile
-index c55c95c..3e9f8ba 100644
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -26,16 +26,13 @@ WANTED_DIRS = \
+=== contrib/Makefile
+==================================================================
+--- contrib/Makefile	(revision 12)
++++ contrib/Makefile	(local)
+@@ -26,16 +26,13 @@
  		pg_freespacemap \
  		pg_standby	\
  		pg_trgm		\
@@ -44,10 +44,10 @@ index c55c95c..3e9f8ba 100644
  
  ifeq ($(with_openssl),yes)
  WANTED_DIRS += sslinfo
-diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
-index e1262fb..7e27aed 100644
---- a/contrib/adminpack/Makefile
-+++ b/contrib/adminpack/Makefile
+=== contrib/adminpack/Makefile
+==================================================================
+--- contrib/adminpack/Makefile	(revision 12)
++++ contrib/adminpack/Makefile	(local)
 @@ -1,7 +1,7 @@
  # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
  
@@ -57,11 +57,11 @@ index e1262fb..7e27aed 100644
  DATA_built = adminpack.sql
  DATA = uninstall_adminpack.sql
  OBJS = adminpack.o
-diff --git a/src/Makefile b/src/Makefile
-index 8d66bf6..6818ef5 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -19,14 +19,11 @@ all install installdirs uninstall distprep:
+=== src/Makefile
+==================================================================
+--- src/Makefile	(revision 12)
++++ src/Makefile	(local)
+@@ -19,14 +19,11 @@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
  	$(MAKE) -C backend/snowball $@
@@ -77,11 +77,11 @@ index 8d66bf6..6818ef5 100644
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index aa41ee9..5595990 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -373,10 +373,8 @@ endif
+=== src/Makefile.global.in
+==================================================================
+--- src/Makefile.global.in	(revision 12)
++++ src/Makefile.global.in	(local)
+@@ -373,10 +373,8 @@
  
  
  submake-libpq:
@@ -92,20 +92,21 @@ index aa41ee9..5595990 100644
  
  .PHONY: submake-libpq submake-libpgport
  
-@@ -419,6 +417,8 @@ ifdef PROFILE
+@@ -419,7 +417,9 @@
     LDFLAGS += $(PROFILE)
  endif
  
 +CFLAGS += -I${top_srcdir}/src/include
-+
  
++
  ##########################################################################
  #
-diff --git a/src/bin/Makefile b/src/bin/Makefile
-index ec8f7ce..3f82a7f 100644
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -13,8 +13,8 @@ subdir = src/bin
+ # substitute implementations of C library routines (see src/port/)
+=== src/bin/Makefile
+==================================================================
+--- src/bin/Makefile	(revision 12)
++++ src/bin/Makefile	(local)
+@@ -13,8 +13,8 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
@@ -116,11 +117,11 @@ index ec8f7ce..3f82a7f 100644
  ifeq ($(PORTNAME), win32)
  DIRS+=pgevent
  endif
-diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
-index eac7a09..4fcbb0f 100644
---- a/src/bin/initdb/Makefile
-+++ b/src/bin/initdb/Makefile
-@@ -14,7 +14,7 @@ subdir = src/bin/initdb
+=== src/bin/initdb/Makefile
+==================================================================
+--- src/bin/initdb/Makefile	(revision 12)
++++ src/bin/initdb/Makefile	(local)
+@@ -14,7 +14,7 @@
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
@@ -129,11 +130,11 @@ index eac7a09..4fcbb0f 100644
  
  OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
  
-diff --git a/src/port/Makefile b/src/port/Makefile
-index b113159..c786e83 100644
---- a/src/port/Makefile
-+++ b/src/port/Makefile
-@@ -35,11 +35,10 @@ OBJS = $(LIBOBJS) chklocale.o copydir.o dirmod.o exec.o noblock.o path.o pipe.o
+=== src/port/Makefile
+==================================================================
+--- src/port/Makefile	(revision 12)
++++ src/port/Makefile	(local)
+@@ -35,11 +35,10 @@
  # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND
  OBJS_SRV = $(OBJS:%.o=%_srv.o)
  
@@ -147,31 +148,24 @@ index b113159..c786e83 100644
  
  installdirs:
  	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 4d19f9c..efb3bb9 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -135,13 +135,14 @@ all-spi:
- tablespace-setup:
- 	-rm -rf ./testtablespace
- 	mkdir ./testtablespace
-+	chown -Rf portage .
- 
- ##
- ## Run tests
+=== src/test/regress/GNUmakefile
+==================================================================
+--- src/test/regress/GNUmakefile	(revision 12)
++++ src/test/regress/GNUmakefile	(local)
+@@ -141,7 +141,7 @@
  ##
  
  check: all
 -	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF)
-+	su -s /bin/sh portage -c "PATH=\"${PATH}\" ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/"
++	./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir=$(abs_srcdir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/
  
  installcheck: all
  	./pg_regress --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule --srcdir=$(abs_srcdir) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
-diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
-index 7d4f50f..c30c47c 100644
---- a/src/test/regress/pg_regress.c
-+++ b/src/test/regress/pg_regress.c
-@@ -771,9 +771,6 @@ initialize_environment(void)
+=== src/test/regress/pg_regress.c
+==================================================================
+--- src/test/regress/pg_regress.c	(revision 12)
++++ src/test/regress/pg_regress.c	(local)
+@@ -781,9 +781,6 @@
  		sprintf(tmp, "%s/install/%s", temp_install, datadir);
  		datadir = tmp;
  
@@ -181,7 +175,7 @@ index 7d4f50f..c30c47c 100644
  		/*
  		 * Set up shared library paths to include the temp install.
  		 *
-@@ -2043,7 +2040,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
+@@ -2053,7 +2050,7 @@
  		 */
  		snprintf(buf, sizeof(buf),
  				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
diff --git a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
index 2e83ad1..723cb20 100644
--- a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
@@ -84,14 +84,14 @@ src_compile() {
 		$(use_with python) \
 		$(use_with tcl) \
 		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libs="/usr/lib/postgresql-${SLOT}/lib/" \
+		--with-libs="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)/" \
 		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		"CFLAGS='${CFLAGS} $(use xml && pkg-config --cflags libxml-2.0)'" \
-		"LIBS='${LIBS} $(use xml && pkg-config --libs libxml-2.0) -L/usr/lib/postgresql-${SLOT}/lib'" \
+		"LIBS='${LIBS} $(use xml && pkg-config --libs libxml-2.0) -L/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)'" \
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				docdir=/usr/share/doc/${PF} SLOT=${SLOT} || die "emake in $bd failed"
 	done
@@ -105,7 +105,7 @@ src_install() {
 	fi
 
 	for bd in . contrib $(use xml && echo contrib/xml) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				docdir=/usr/share/doc/${PF} SLOT=${SLOT} || die "emake install in $bd failed"
 	done
@@ -114,8 +114,8 @@ src_install() {
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
-	dodir /usr/lib/eselect-postgresql/slots/${SLOT}
-	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+	dodir /usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}
+	cat >"${D}/usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__
@@ -195,7 +195,7 @@ pkg_config() {
 
 src_test() {
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
diff --git a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
index 582fbf0..985fe62 100644
--- a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
@@ -83,14 +83,14 @@ src_compile() {
 		$(use_with python) \
 		$(use_with tcl) \
 		--with-includes="/usr/include/postgresql-${SLOT}/" \
-		--with-libs="/usr/lib/postgresql-${SLOT}/lib/" \
+		--with-libs="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)/" \
 		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		"CFLAGS='${CFLAGS} $(use xml && pkg-config --cflags libxml-2.0)'" \
-		"LIBS='${LIBS} $(use xml && pkg-config --libs libxml-2.0) -L/usr/lib/postgresql-${SLOT}/lib'" \
+		"LIBS='${LIBS} $(use xml && pkg-config --libs libxml-2.0) -L/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)'" \
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				docdir=/usr/share/doc/${PF} SLOT=${SLOT} || die "emake in $bd failed"
 	done
@@ -104,7 +104,7 @@ src_install() {
 	fi
 
 	for bd in . contrib $(use xml && echo contrib/xml) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				docdir=/usr/share/doc/${PF} SLOT=${SLOT} || die "emake install in $bd failed"
 	done
@@ -113,8 +113,8 @@ src_install() {
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
-	dodir /usr/lib/eselect-postgresql/slots/${SLOT}
-	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+	dodir /usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}
+	cat >"${D}/usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__
@@ -194,7 +194,7 @@ pkg_config() {
 
 src_test() {
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
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 540c672..fb3b6c1 100644
--- a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
@@ -87,7 +87,7 @@ src_compile() {
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake in $bd failed"
@@ -102,7 +102,7 @@ src_install() {
 	fi
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake install in $bd failed"
@@ -112,8 +112,8 @@ src_install() {
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
-	dodir /usr/lib/eselect-postgresql/slots/${SLOT}
-	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+	dodir /usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}
+	cat >"${D}/usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__
@@ -192,8 +192,10 @@ pkg_config() {
 }
 
 src_test() {
+	export LC_ALL="C"
+
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
diff --git a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
index 993d83c..87f0172 100644
--- a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
@@ -87,7 +87,7 @@ src_compile() {
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake in $bd failed"
@@ -102,7 +102,7 @@ src_install() {
 	fi
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 				NO_PGXS=0 USE_PGXS=1 docdir=/usr/share/doc/${PF} || die "emake install in $bd failed"
@@ -112,8 +112,8 @@ src_install() {
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
-	dodir /usr/lib/eselect-postgresql/slots/${SLOT}
-	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+	dodir /usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}
+	cat >"${D}/usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__
@@ -196,7 +196,7 @@ pkg_config() {
 
 src_test() {
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
index f1df39e..b58a453 100644
--- a/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
@@ -90,7 +90,7 @@ src_compile() {
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
@@ -106,7 +106,7 @@ src_install() {
 	fi
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
@@ -117,8 +117,8 @@ src_install() {
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
-	dodir /usr/lib/eselect-postgresql/slots/${SLOT}
-	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+	dodir /usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}
+	cat >"${D}/usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__
@@ -201,7 +201,7 @@ pkg_config() {
 
 src_test() {
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
index c02a244..77aa64d 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.0.ebuild
@@ -91,7 +91,7 @@ src_compile() {
 		|| die "configure failed"
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
@@ -107,7 +107,7 @@ src_install() {
 	fi
 
 	for bd in . contrib $(use xml && echo contrib/xml2) ; do
-		PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake install -C $bd -j1 DESTDIR="${D}" \
 				PGXS_IN_SERVER=1 PGXS_WITH_SERVER="${S}/src/backend/postgres" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
@@ -118,8 +118,8 @@ src_install() {
 
 	dodoc README HISTORY doc/{README.*,TODO,bug.template}
 
-	dodir /usr/lib/eselect-postgresql/slots/${SLOT}
-	cat >"${D}/usr/lib/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
+	dodir /usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}
+	cat >"${D}/usr/$(get_libdir)/eselect-postgresql/slots/${SLOT}/service" <<-__EOF__
 		postgres_ebuilds="\${postgres_ebuilds} ${PF}"
 		postgres_service="postgresql-${SLOT}"
 	__EOF__
@@ -202,7 +202,7 @@ pkg_config() {
 
 src_test() {
 	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	PATH="/usr/lib/postgresql-${SLOT}/bin:${PATH}" \
+	PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 		emake -j1 check \
 			PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
 			NO_PGXS=0 USE_PGXS=1 SLOT=${SLOT} || die "Make check failed. See above for details."
author	Tiziano Müller <dev-zero@gentoo.org>	2008-03-10 22:31:14 +0000
committer	Tiziano Müller <dev-zero@gentoo.org>	2008-03-10 22:31:14 +0000
commit	7389839ac18be9c82dfd405ec51ea9805384e441 (patch)
tree	5a6aac27e8498aec2cf0adbb43671992b1ca8fdd
parent	dev-db/postgresql-server: Changed some more dependencies on postgresql-libs t... (diff)
download	experimental-7389839ac18be9c82dfd405ec51ea9805384e441.tar.gz experimental-7389839ac18be9c82dfd405ec51ea9805384e441.tar.bz2 experimental-7389839ac18be9c82dfd405ec51ea9805384e441.zip