dev-db/postgresql*: bump 8.3* to 8.3_rc1

svn path=/experimental/; revision=306

23 files changed, 191 insertions, 166 deletions

diff --git a/dev-db/postgresql-client/Manifest b/dev-db/postgresql-client/Manifest
index d529007..052bd94 100644
--- a/dev-db/postgresql-client/Manifest
+++ b/dev-db/postgresql-client/Manifest
@@ -54,21 +54,20 @@ AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b83
 MD5 510f7cca742d90f09d5fd32d05ddaa08 files/postgresql-8.2-common.patch 2640
 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 files/postgresql-8.2-common.patch 2640
 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8 files/postgresql-8.2-common.patch 2640
-AUX postgresql-8.3-client.patch 2973 RMD160 04a7160587e480da601df5a0926374269a1325b9 SHA1 29fc05b9ed84f79fe19668595d0b7c8947a7b54b SHA256 5a8f2fc3e33eb34a07c2628c16e158677770304b9c59eea0f72715b0387416b2
-MD5 8a7e279d3e0697b865cab398427f9b8f files/postgresql-8.3-client.patch 2973
-RMD160 04a7160587e480da601df5a0926374269a1325b9 files/postgresql-8.3-client.patch 2973
-SHA256 5a8f2fc3e33eb34a07c2628c16e158677770304b9c59eea0f72715b0387416b2 files/postgresql-8.3-client.patch 2973
-AUX postgresql-8.3-common.patch 1930 RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 SHA1 2365d9ba190a73f223fb77ebd90cd71dcff147ed SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb
-MD5 ca57645c7e7903cb6f8db93392ecca23 files/postgresql-8.3-common.patch 1930
-RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 files/postgresql-8.3-common.patch 1930
-SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb files/postgresql-8.3-common.patch 1930
+AUX postgresql-8.3-client.patch 2987 RMD160 660cbe610899935c4e7611dc7026229201cbcbf5 SHA1 d8b89f7e74d728f5cf9313ed52ff581a5a22bcea SHA256 1fddcfc380affe20c8e5a4d4dd5114eabc6e96719e4f617211cf19305f3c4fac
+MD5 d4c6df93ca0dd4e2e771ec231000df13 files/postgresql-8.3-client.patch 2987
+RMD160 660cbe610899935c4e7611dc7026229201cbcbf5 files/postgresql-8.3-client.patch 2987
+SHA256 1fddcfc380affe20c8e5a4d4dd5114eabc6e96719e4f617211cf19305f3c4fac files/postgresql-8.3-client.patch 2987
+AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
+MD5 e1d116082e50ab3c8c00da5cff4cb5a4 files/postgresql-8.3-common.patch 2641
+RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 files/postgresql-8.3-common.patch 2641
+SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197 files/postgresql-8.3-common.patch 2641
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 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-base-8.3beta2.tar.bz2 9587997 RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 SHA1 cab5a2d93fe87783800683d22719717152dddc17 SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
-DIST postgresql-opt-8.3beta2.tar.bz2 178552 RMD160 33c74cec29ee085e68614712884ac9910a5d69e2 SHA1 d70db3f13d79e0d322a9c114cb1a8d8ed0f65aba SHA256 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725
+DIST postgresql-8.3RC1.tar.bz2 13801207 RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 SHA1 b58a3a3e26198469e23829697cdc33d02b2530f5 SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a
 EBUILD postgresql-client-7.3.21.ebuild 2741 RMD160 95352563cd90c82dfd2f1c3854a559ecbace2429 SHA1 9b1ca0d41e5b2f1b0202ef2615ce0d24fea9bc18 SHA256 64cb434f98ea2ab9e9c3f9524fba0e9de050aace5a97d72a081fcb6d4164db86
 MD5 00dbe64954d96e4bb8032a63d03b83c4 postgresql-client-7.3.21.ebuild 2741
 RMD160 95352563cd90c82dfd2f1c3854a559ecbace2429 postgresql-client-7.3.21.ebuild 2741
@@ -89,10 +88,10 @@ EBUILD postgresql-client-8.2.6.ebuild 3250 RMD160 6d1a93dc11ddef86f7e64ed4faf5b5
 MD5 7ada7f43b9f54ec270499bd3b3987c25 postgresql-client-8.2.6.ebuild 3250
 RMD160 6d1a93dc11ddef86f7e64ed4faf5b56d4c6c3051 postgresql-client-8.2.6.ebuild 3250
 SHA256 39acd92db3792df8170f740ee13d66ae24a70e0fdd5f6a7f2adc66b5e29d0d0e postgresql-client-8.2.6.ebuild 3250
-EBUILD postgresql-client-8.3_beta2.ebuild 3334 RMD160 d3e553f18ab0de6cf3a3a0b75ae98a8c740f7aef SHA1 370c0cec1dce119ac2448b1da20463c22a636a74 SHA256 fbd17636e5b56b9af32b4f7c9c981379de1dffc6a1efbe5d827dd3084f728004
-MD5 6a61f2346976097399457a659338f616 postgresql-client-8.3_beta2.ebuild 3334
-RMD160 d3e553f18ab0de6cf3a3a0b75ae98a8c740f7aef postgresql-client-8.3_beta2.ebuild 3334
-SHA256 fbd17636e5b56b9af32b4f7c9c981379de1dffc6a1efbe5d827dd3084f728004 postgresql-client-8.3_beta2.ebuild 3334
+EBUILD postgresql-client-8.3_rc1.ebuild 3271 RMD160 a552e483f455d55cc58400f5e21e8401358f5322 SHA1 c6a2e085a5e446e7590da85e1cd24517c689ffc6 SHA256 ae9b4d2c69699e9594477ae8465e7824601cae8d69109205d036cbe45562b775
+MD5 e31af871f4c376e9aea2545ecf517ab3 postgresql-client-8.3_rc1.ebuild 3271
+RMD160 a552e483f455d55cc58400f5e21e8401358f5322 postgresql-client-8.3_rc1.ebuild 3271
+SHA256 ae9b4d2c69699e9594477ae8465e7824601cae8d69109205d036cbe45562b775 postgresql-client-8.3_rc1.ebuild 3271
 MISC ChangeLog 400 RMD160 202fdecd325c69bd3e320935dd4a482004ab3230 SHA1 cde5fb2153e5d699a5b81832fa8982e975102f7a SHA256 33dfa19bf969f887c795d0a79da85fb66f089f721713ff453e8357468ab37ad9
 MD5 f46c4d0bd3dd41451e001bf66e6ccc5b ChangeLog 400
 RMD160 202fdecd325c69bd3e320935dd4a482004ab3230 ChangeLog 400
@@ -112,6 +111,6 @@ SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/di
 MD5 82e0a8c26d6b4ca23a88e14f9c1364dd files/digest-postgresql-client-8.2.6 259
 RMD160 eaeca374a581f849a0d441e81a9a195696422978 files/digest-postgresql-client-8.2.6 259
 SHA256 dd2fd7fd45f83726f1cdcdd60e97ae51bb222030679916ff44a3f623a41930e9 files/digest-postgresql-client-8.2.6 259
-MD5 60950577684e73508fa51ab6dc4cdd54 files/digest-postgresql-client-8.3_beta2 554
-RMD160 247f8f337707fe3abf4fb5d1e02bff0d9c1fb717 files/digest-postgresql-client-8.3_beta2 554
-SHA256 fe71f73b10bd20dd9b5e03c77af03841eea1d75526bea841bdd7a3bc9c1d0650 files/digest-postgresql-client-8.3_beta2 554
+MD5 f2a20168d6f9484e0ace623b4ce6de6e files/digest-postgresql-client-8.3_rc1 262
+RMD160 019bc970caed3347a76f9e7099c8b6a2cf70385d files/digest-postgresql-client-8.3_rc1 262
+SHA256 8584bc879e3ab91baac2b3d7a4e5041ec2e13d74a00b603272af761d88c1554a files/digest-postgresql-client-8.3_rc1 262
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.3_beta2 b/dev-db/postgresql-client/files/digest-postgresql-client-8.3_beta2
deleted file mode 100644
index fab488b..0000000
--- a/dev-db/postgresql-client/files/digest-postgresql-client-8.3_beta2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0430c321a9aacc2cb6c190cdccc34c78 postgresql-base-8.3beta2.tar.bz2 9587997
-RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 postgresql-base-8.3beta2.tar.bz2 9587997
-SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 postgresql-base-8.3beta2.tar.bz2 9587997
-MD5 70a34048525224a2d7187bf23b4d25b6 postgresql-opt-8.3beta2.tar.bz2 178552
-RMD160 33c74cec29ee085e68614712884ac9910a5d69e2 postgresql-opt-8.3beta2.tar.bz2 178552
-SHA256 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 postgresql-opt-8.3beta2.tar.bz2 178552
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.3_rc1 b/dev-db/postgresql-client/files/digest-postgresql-client-8.3_rc1
new file mode 100644
index 0000000..9e44c24
--- /dev/null
+++ b/dev-db/postgresql-client/files/digest-postgresql-client-8.3_rc1
@@ -0,0 +1,3 @@
+MD5 c0994ab0d16aa7410d05102344f819fe postgresql-8.3RC1.tar.bz2 13801207
+RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 postgresql-8.3RC1.tar.bz2 13801207
+SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a postgresql-8.3RC1.tar.bz2 13801207
diff --git a/dev-db/postgresql-client/files/postgresql-8.3-client.patch b/dev-db/postgresql-client/files/postgresql-8.3-client.patch
index fcc01b9..9345184 100644
--- a/dev-db/postgresql-client/files/postgresql-8.3-client.patch
+++ b/dev-db/postgresql-client/files/postgresql-8.3-client.patch
@@ -23,10 +23,10 @@ index f7bcc67..ec8fcf1 100644
  distprep:
  	$(MAKE) -C doc $@
 diff --git a/contrib/Makefile b/contrib/Makefile
-index 0bd9e65..c2bedf1 100644
+index c55c95c..81bfdeb 100644
 --- a/contrib/Makefile
 +++ b/contrib/Makefile
-@@ -5,51 +5,9 @@ top_builddir = ..
+@@ -5,52 +5,9 @@ top_builddir = ..
  include $(top_builddir)/src/Makefile.global
  
  WANTED_DIRS = \
@@ -59,6 +59,7 @@ index 0bd9e65..c2bedf1 100644
 -		spi		\
 -		tablefunc	\
 -		test_parser	\
+-		tsearch2	\
  		vacuumlo
  
 -ifeq ($(with_openssl),yes)
@@ -106,10 +107,10 @@ index 8d66bf6..8db6434 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 cbe2634..0c534f8 100644
+index aa41ee9..6f64051 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -372,10 +372,8 @@ endif
+@@ -373,10 +373,8 @@ endif
  
  
  submake-libpq:
@@ -121,7 +122,7 @@ index cbe2634..0c534f8 100644
  .PHONY: submake-libpq submake-libpgport
  
 diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 1f319d5..fbade52 100644
+index ec8f7ce..366a412 100644
 --- a/src/bin/Makefile
 +++ b/src/bin/Makefile
 @@ -13,8 +13,8 @@ subdir = src/bin
diff --git a/dev-db/postgresql-client/files/postgresql-8.3-common.patch b/dev-db/postgresql-client/files/postgresql-8.3-common.patch
index bab8258..c9f2ad2 100644
--- a/dev-db/postgresql-client/files/postgresql-8.3-common.patch
+++ b/dev-db/postgresql-client/files/postgresql-8.3-common.patch
@@ -17,8 +17,23 @@ index 9434113..d72b35c 100644
    AC_SUBST(localedir)
  ])# PGAC_CHECK_GETTEXT
  
+diff --git a/configure.in b/configure.in
+index 58cc61c..07ffc38 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index a9cbeac..d5c2764 100644
+index 7d9448f..07799bc 100644
 --- a/src/include/storage/s_lock.h
 +++ b/src/include/storage/s_lock.h
 @@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
diff --git a/dev-db/postgresql-client/postgresql-client-8.3_beta2.ebuild b/dev-db/postgresql-client/postgresql-client-8.3_rc1.ebuild
index afc7422..ed20b69 100644
--- a/dev-db/postgresql-client/postgresql-client-8.3_beta2.ebuild
+++ b/dev-db/postgresql-client/postgresql-client-8.3_rc1.ebuild
@@ -11,8 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
 
 DESCRIPTION="PostgreSQL client applications"
 HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV/_/}/postgresql-base-${PV/_/}.tar.bz2
-	mirror://postgresql/source/v${PV/_/}/postgresql-opt-${PV/_/}.tar.bz2"
+SRC_URI="mirror://postgresql/source/v${PV/_rc/RC}/postgresql-${PV/_rc/RC}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
 # find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
@@ -33,7 +32,7 @@ DEPEND="~dev-db/postgresql-libs-${PV}"
 RDEPEND="${DEPEND}"
 PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
 
-S="${WORKDIR}/postgresql-${PV/_/}"
+S="${WORKDIR}/postgresql-${PV/_rc/RC}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-db/postgresql-docs/Manifest b/dev-db/postgresql-docs/Manifest
index a13b03b..fe69474 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -3,7 +3,7 @@ DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 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-docs-8.3beta2.tar.bz2 2990921 RMD160 70d45c84e18ea335b8df48cb09cfb98e5758878e SHA1 68b189a6f1d9ddf133650a51e04d8dbd7fec83c9 SHA256 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8
+DIST postgresql-8.3RC1.tar.bz2 13801207 RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 SHA1 b58a3a3e26198469e23829697cdc33d02b2530f5 SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a
 EBUILD postgresql-docs-7.3.21.ebuild 1001 RMD160 34a77ce99efce34aa5f31004339004e794bbff1e SHA1 b40fa0250e5c01c25d3e21c7bb43e09d639fb246 SHA256 bdf70e28c20d2c458e83ea6c77a4c20b0bbbdb556c4051e70dbbb57e2c4afede
 MD5 b6b80a6c42dd126374ef4d6072880fda postgresql-docs-7.3.21.ebuild 1001
 RMD160 34a77ce99efce34aa5f31004339004e794bbff1e postgresql-docs-7.3.21.ebuild 1001
@@ -24,10 +24,10 @@ EBUILD postgresql-docs-8.2.6.ebuild 1001 RMD160 05ad8bcc2c5a42ebe2145e80456af8e8
 MD5 a632c1d2ac6914ccacd4e4c1a9d1dd00 postgresql-docs-8.2.6.ebuild 1001
 RMD160 05ad8bcc2c5a42ebe2145e80456af8e866b71081 postgresql-docs-8.2.6.ebuild 1001
 SHA256 ad030ede527b1de68db40be539ed85f5f3dbb79b71e6d0c40cdec785567777fa postgresql-docs-8.2.6.ebuild 1001
-EBUILD postgresql-docs-8.3_beta2.ebuild 993 RMD160 782c39d60bdd9349e1ab70a653cb4fe2632c0052 SHA1 8797a615a933acd3fcbc526cfdef0b4a5007612a SHA256 eb7123a5d480d1060f460cbeaedad743ca3099885ae2704c18ae1c3c90062049
-MD5 ee55660f2b384135ce7480fe449deee3 postgresql-docs-8.3_beta2.ebuild 993
-RMD160 782c39d60bdd9349e1ab70a653cb4fe2632c0052 postgresql-docs-8.3_beta2.ebuild 993
-SHA256 eb7123a5d480d1060f460cbeaedad743ca3099885ae2704c18ae1c3c90062049 postgresql-docs-8.3_beta2.ebuild 993
+EBUILD postgresql-docs-8.3_rc1.ebuild 1022 RMD160 a9af1cc7217a7ea358a009afa0d7cff6ba785847 SHA1 12f030dda25cdf8bd4c63438464e7c86beb1e87f SHA256 515976f95ce9b7fe304a16f323a8b2e057760b59ef151b6baa29d6caf1e07a0d
+MD5 df30e0db7fd33967d182f98f07f38e94 postgresql-docs-8.3_rc1.ebuild 1022
+RMD160 a9af1cc7217a7ea358a009afa0d7cff6ba785847 postgresql-docs-8.3_rc1.ebuild 1022
+SHA256 515976f95ce9b7fe304a16f323a8b2e057760b59ef151b6baa29d6caf1e07a0d postgresql-docs-8.3_rc1.ebuild 1022
 MD5 6a3445a4a42effc608ada08460d79d23 files/digest-postgresql-docs-7.3.21 259
 RMD160 ae6f019781a5bec259542ac5a4dbb9fd0727e24f files/digest-postgresql-docs-7.3.21 259
 SHA256 4a09b60d4700c7feb998b1d07118eab0b930bee7a325ab3a138246c2c7e86ec6 files/digest-postgresql-docs-7.3.21 259
@@ -43,6 +43,6 @@ SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/di
 MD5 82e0a8c26d6b4ca23a88e14f9c1364dd files/digest-postgresql-docs-8.2.6 259
 RMD160 eaeca374a581f849a0d441e81a9a195696422978 files/digest-postgresql-docs-8.2.6 259
 SHA256 dd2fd7fd45f83726f1cdcdd60e97ae51bb222030679916ff44a3f623a41930e9 files/digest-postgresql-docs-8.2.6 259
-MD5 479c47f4a66ed97ed089e059627790c3 files/digest-postgresql-docs-8.3_beta2 280
-RMD160 af4400bc8226bb41188d9b8108522036af1d950b files/digest-postgresql-docs-8.3_beta2 280
-SHA256 ca3da27d61891677ff6251f60356516061be3fbf771c5be9e39106920935c055 files/digest-postgresql-docs-8.3_beta2 280
+MD5 f2a20168d6f9484e0ace623b4ce6de6e files/digest-postgresql-docs-8.3_rc1 262
+RMD160 019bc970caed3347a76f9e7099c8b6a2cf70385d files/digest-postgresql-docs-8.3_rc1 262
+SHA256 8584bc879e3ab91baac2b3d7a4e5041ec2e13d74a00b603272af761d88c1554a files/digest-postgresql-docs-8.3_rc1 262
diff --git a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.3_beta2 b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.3_beta2
deleted file mode 100644
index 5660881..0000000
--- a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.3_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ae0fcf93ff45c9dbae7899f13a86999 postgresql-docs-8.3beta2.tar.bz2 2990921
-RMD160 70d45c84e18ea335b8df48cb09cfb98e5758878e postgresql-docs-8.3beta2.tar.bz2 2990921
-SHA256 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8 postgresql-docs-8.3beta2.tar.bz2 2990921
diff --git a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.3_rc1 b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.3_rc1
new file mode 100644
index 0000000..9e44c24
--- /dev/null
+++ b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.3_rc1
@@ -0,0 +1,3 @@
+MD5 c0994ab0d16aa7410d05102344f819fe postgresql-8.3RC1.tar.bz2 13801207
+RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 postgresql-8.3RC1.tar.bz2 13801207
+SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a postgresql-8.3RC1.tar.bz2 13801207
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.3_beta2.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.3_rc1.ebuild
index 9e27266..cb90fdf 100644
--- a/dev-db/postgresql-docs/postgresql-docs-8.3_beta2.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-8.3_rc1.ebuild
@@ -8,14 +8,18 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
 
 DESCRIPTION="PostgreSQL documentation"
 HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV/_/}/postgresql-docs-${PV/_/}.tar.bz2"
+SRC_URI="mirror://postgresql/source/v${PV/_rc/RC}/postgresql-${PV/_rc/RC}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
 IUSE=""
 
 DEPEND=""
 
-S="${WORKDIR}/postgresql-${PV/_/}"
+S="${WORKDIR}/postgresql-${PV/_rc/RC}"
+
+src_compile() {
+	:
+}
 
 src_install() {
 	dodir /usr/share/doc/${PF}/html
diff --git a/dev-db/postgresql-libs/Manifest b/dev-db/postgresql-libs/Manifest
index 00049ba..e4c01fc 100644
--- a/dev-db/postgresql-libs/Manifest
+++ b/dev-db/postgresql-libs/Manifest
@@ -42,21 +42,20 @@ AUX postgresql-8.2-libs.patch 3399 RMD160 06674b5a524ab321b301965e1493ba7a09ab32
 MD5 ae6a526180b90402632a533fbaad4c1f files/postgresql-8.2-libs.patch 3399
 RMD160 06674b5a524ab321b301965e1493ba7a09ab32cc files/postgresql-8.2-libs.patch 3399
 SHA256 bf56f69add42b84646346310266e0f14b8cc02a71d6ade96a2f7a05158f4aabd files/postgresql-8.2-libs.patch 3399
-AUX postgresql-8.3-common.patch 1930 RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 SHA1 2365d9ba190a73f223fb77ebd90cd71dcff147ed SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb
-MD5 ca57645c7e7903cb6f8db93392ecca23 files/postgresql-8.3-common.patch 1930
-RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 files/postgresql-8.3-common.patch 1930
-SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb files/postgresql-8.3-common.patch 1930
-AUX postgresql-8.3-libs.patch 3453 RMD160 125ddb8a98f44493513b90301dbfd982213bd7f4 SHA1 e4469a7cfedb3331f5440a36fe324dc237eaa76c SHA256 0363fc5ab8289ddca2e944ef00d7773a2add231675e6eabaaaa56591423be8f5
-MD5 090488d3e151f8805d292f21e344687b files/postgresql-8.3-libs.patch 3453
-RMD160 125ddb8a98f44493513b90301dbfd982213bd7f4 files/postgresql-8.3-libs.patch 3453
-SHA256 0363fc5ab8289ddca2e944ef00d7773a2add231675e6eabaaaa56591423be8f5 files/postgresql-8.3-libs.patch 3453
+AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
+MD5 e1d116082e50ab3c8c00da5cff4cb5a4 files/postgresql-8.3-common.patch 2641
+RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 files/postgresql-8.3-common.patch 2641
+SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197 files/postgresql-8.3-common.patch 2641
+AUX postgresql-8.3-libs.patch 3453 RMD160 d8424fe836d720840e01353e7c8ba6c282ce8a28 SHA1 8e1550b7150b3f931faeaf56c0158fc9b6944392 SHA256 65841a48331f8e399dd3efd1e77bacd568acd2f02109d79dc98eea73fe7af3b6
+MD5 e515de6cd026ce2be35c919df1d0ad3c files/postgresql-8.3-libs.patch 3453
+RMD160 d8424fe836d720840e01353e7c8ba6c282ce8a28 files/postgresql-8.3-libs.patch 3453
+SHA256 65841a48331f8e399dd3efd1e77bacd568acd2f02109d79dc98eea73fe7af3b6 files/postgresql-8.3-libs.patch 3453
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
 DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 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-base-8.3beta2.tar.bz2 9587997 RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 SHA1 cab5a2d93fe87783800683d22719717152dddc17 SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
-DIST postgresql-test-8.3beta2.tar.bz2 1069384 RMD160 8367c77ceb6116518b57e723aa1a060b9a4b5c5f SHA1 7b0a1d967903c8a93ca32c83f6221f5d76d5be76 SHA256 e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15
+DIST postgresql-8.3RC1.tar.bz2 13801207 RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 SHA1 b58a3a3e26198469e23829697cdc33d02b2530f5 SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a
 EBUILD postgresql-libs-7.3.21.ebuild 3891 RMD160 bc286ee2a82197968d4dd680e39b4135a311d0b1 SHA1 6f881bedae696aa0962f933c89b1cf60a4ae4ebd SHA256 be30b4ca67bdd2a05f94720e6be36cde11f5d1a3ff3d93fd143a72891ad72186
 MD5 6c5897a042fa47c614443560a17c4135 postgresql-libs-7.3.21.ebuild 3891
 RMD160 bc286ee2a82197968d4dd680e39b4135a311d0b1 postgresql-libs-7.3.21.ebuild 3891
@@ -77,10 +76,10 @@ EBUILD postgresql-libs-8.2.6.ebuild 4111 RMD160 9c521cdada7e9eaca58f5c22795a9363
 MD5 194aea1e34c1d9600e1647a5782d6f59 postgresql-libs-8.2.6.ebuild 4111
 RMD160 9c521cdada7e9eaca58f5c22795a936391eca5f3 postgresql-libs-8.2.6.ebuild 4111
 SHA256 e814e91652e743b3949f91a2e46cdd657d9b955e0b23a7a928943b92c5c7f27c postgresql-libs-8.2.6.ebuild 4111
-EBUILD postgresql-libs-8.3_beta2.ebuild 4210 RMD160 bfd54327d09ffe75249f5f422c6b9f242b70becf SHA1 86f15ac11fb36f1ea788f65a63006e53470ab639 SHA256 cc6448d6d3d6660abba27777a55a7ea3e5c3b4ca22c97a580bfc364413db4478
-MD5 22c49f49f9b082c582985d023c200399 postgresql-libs-8.3_beta2.ebuild 4210
-RMD160 bfd54327d09ffe75249f5f422c6b9f242b70becf postgresql-libs-8.3_beta2.ebuild 4210
-SHA256 cc6448d6d3d6660abba27777a55a7ea3e5c3b4ca22c97a580bfc364413db4478 postgresql-libs-8.3_beta2.ebuild 4210
+EBUILD postgresql-libs-8.3_rc1.ebuild 4132 RMD160 6a605d7e7e4019e24085eea40b0eb83e1d19b722 SHA1 3f54010f30441691e960137cdf2c91083523b77d SHA256 c1b3c9ac99318c2a2134337531e1537db61eb1cb9592b3f5698043e6adde781a
+MD5 c9dc57a489c58de480bdce1e8720c32e postgresql-libs-8.3_rc1.ebuild 4132
+RMD160 6a605d7e7e4019e24085eea40b0eb83e1d19b722 postgresql-libs-8.3_rc1.ebuild 4132
+SHA256 c1b3c9ac99318c2a2134337531e1537db61eb1cb9592b3f5698043e6adde781a postgresql-libs-8.3_rc1.ebuild 4132
 MISC ChangeLog 400 RMD160 ca729246e5c726e3b01b2c0c62718b505842dfb2 SHA1 8ed3d5e9213e84edcd426bd58cf19478e0c2c7d3 SHA256 37e34604de47ded00b6da91224ab32be7bd9cee7af0df9f80a4f0c661e88b171
 MD5 fa0d2242fded2ca473e1b749069da17c ChangeLog 400
 RMD160 ca729246e5c726e3b01b2c0c62718b505842dfb2 ChangeLog 400
@@ -104,6 +103,6 @@ SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/di
 MD5 82e0a8c26d6b4ca23a88e14f9c1364dd files/digest-postgresql-libs-8.2.6 259
 RMD160 eaeca374a581f849a0d441e81a9a195696422978 files/digest-postgresql-libs-8.2.6 259
 SHA256 dd2fd7fd45f83726f1cdcdd60e97ae51bb222030679916ff44a3f623a41930e9 files/digest-postgresql-libs-8.2.6 259
-MD5 7aec99c1000c1057616e7d63f5f304b2 files/digest-postgresql-libs-8.3_beta2 560
-RMD160 0cc482c3bf874d678b7a9bf511455d1385c02a4a files/digest-postgresql-libs-8.3_beta2 560
-SHA256 a073f07ef9a13fc9ac1b12e0182f84b7b3991e38a99fc800829ed09ccac4df0a files/digest-postgresql-libs-8.3_beta2 560
+MD5 f2a20168d6f9484e0ace623b4ce6de6e files/digest-postgresql-libs-8.3_rc1 262
+RMD160 019bc970caed3347a76f9e7099c8b6a2cf70385d files/digest-postgresql-libs-8.3_rc1 262
+SHA256 8584bc879e3ab91baac2b3d7a4e5041ec2e13d74a00b603272af761d88c1554a files/digest-postgresql-libs-8.3_rc1 262
diff --git a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.3_beta2 b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.3_beta2
deleted file mode 100644
index 9f83c77..0000000
--- a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.3_beta2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0430c321a9aacc2cb6c190cdccc34c78 postgresql-base-8.3beta2.tar.bz2 9587997
-RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 postgresql-base-8.3beta2.tar.bz2 9587997
-SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 postgresql-base-8.3beta2.tar.bz2 9587997
-MD5 5cd74896dc0d0cce0cd1abd75ab4b12d postgresql-test-8.3beta2.tar.bz2 1069384
-RMD160 8367c77ceb6116518b57e723aa1a060b9a4b5c5f postgresql-test-8.3beta2.tar.bz2 1069384
-SHA256 e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 postgresql-test-8.3beta2.tar.bz2 1069384
diff --git a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.3_rc1 b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.3_rc1
new file mode 100644
index 0000000..9e44c24
--- /dev/null
+++ b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.3_rc1
@@ -0,0 +1,3 @@
+MD5 c0994ab0d16aa7410d05102344f819fe postgresql-8.3RC1.tar.bz2 13801207
+RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 postgresql-8.3RC1.tar.bz2 13801207
+SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a postgresql-8.3RC1.tar.bz2 13801207
diff --git a/dev-db/postgresql-libs/files/postgresql-8.3-common.patch b/dev-db/postgresql-libs/files/postgresql-8.3-common.patch
index bab8258..c9f2ad2 100644
--- a/dev-db/postgresql-libs/files/postgresql-8.3-common.patch
+++ b/dev-db/postgresql-libs/files/postgresql-8.3-common.patch
@@ -17,8 +17,23 @@ index 9434113..d72b35c 100644
    AC_SUBST(localedir)
  ])# PGAC_CHECK_GETTEXT
  
+diff --git a/configure.in b/configure.in
+index 58cc61c..07ffc38 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index a9cbeac..d5c2764 100644
+index 7d9448f..07799bc 100644
 --- a/src/include/storage/s_lock.h
 +++ b/src/include/storage/s_lock.h
 @@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
diff --git a/dev-db/postgresql-libs/files/postgresql-8.3-libs.patch b/dev-db/postgresql-libs/files/postgresql-8.3-libs.patch
index ea94ab0..60d7289 100644
--- a/dev-db/postgresql-libs/files/postgresql-8.3-libs.patch
+++ b/dev-db/postgresql-libs/files/postgresql-8.3-libs.patch
@@ -44,7 +44,7 @@ index 8d66bf6..335350d 100644
  install: install-local
  
 diff --git a/src/backend/Makefile b/src/backend/Makefile
-index 9d2dbe6..5bdf850 100644
+index 7e67bd3..8638d5d 100644
 --- a/src/backend/Makefile
 +++ b/src/backend/Makefile
 @@ -34,7 +34,7 @@ LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)
@@ -92,7 +92,7 @@ index 9d2dbe6..5bdf850 100644
  install-bin: postgres $(POSTGRES_IMP) installdirs
  	$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
 diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 1f319d5..e2cffb6 100644
+index ec8f7ce..5e5f63a 100644
 --- a/src/bin/Makefile
 +++ b/src/bin/Makefile
 @@ -13,8 +13,7 @@ subdir = src/bin
diff --git a/dev-db/postgresql-libs/postgresql-libs-8.3_beta2.ebuild b/dev-db/postgresql-libs/postgresql-libs-8.3_rc1.ebuild
index 68ee558..f79d024 100644
--- a/dev-db/postgresql-libs/postgresql-libs-8.3_beta2.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-8.3_rc1.ebuild
@@ -10,8 +10,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
 
 DESCRIPTION="PostgreSQL libraries"
 HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV/_/}/postgresql-base-${PV/_/}.tar.bz2
-		threads? ( mirror://postgresql/source/v${PV/_/}/postgresql-test-${PV/_/}.tar.bz2 )"
+SRC_URI="mirror://postgresql/source/v${PV/_rc/RC}/postgresql-${PV/_rc/RC}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
 # find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
@@ -42,7 +41,7 @@ DEPEND="${RDEPEND}
 		nls? ( sys-devel/gettext )"
 PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
 
-S="${WORKDIR}/postgresql-${PV/_/}"
+S="${WORKDIR}/postgresql-${PV/_rc/RC}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 18311b6..15af8f6 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -54,18 +54,14 @@ AUX postgresql-8.2-server.patch 4926 RMD160 362010d4ccf9efabdeeac1acc6a8d6c215d7
 MD5 98d5715d668f69c4af2f772300851498 files/postgresql-8.2-server.patch 4926
 RMD160 362010d4ccf9efabdeeac1acc6a8d6c215d7a683 files/postgresql-8.2-server.patch 4926
 SHA256 4c03ee3e8160a06e51c92dddd766d00a677d7d8e45a68ccdb0940612f5452de1 files/postgresql-8.2-server.patch 4926
-AUX postgresql-8.3-common.patch 1930 RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 SHA1 2365d9ba190a73f223fb77ebd90cd71dcff147ed SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb
-MD5 ca57645c7e7903cb6f8db93392ecca23 files/postgresql-8.3-common.patch 1930
-RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 files/postgresql-8.3-common.patch 1930
-SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb files/postgresql-8.3-common.patch 1930
-AUX postgresql-8.3-regress.patch 1894 RMD160 40f7611969cd07b4d64aa29eb5453dfbbcfd72a6 SHA1 38993dc51fdbf2063c66888bde9db28456de0ec3 SHA256 874d9aec37e4950608e8e23fbc8a7982d8e7c020c84e308d1755d485c99e2029
-MD5 da505f45b12f91c87bfa6f4abc7fd83b files/postgresql-8.3-regress.patch 1894
-RMD160 40f7611969cd07b4d64aa29eb5453dfbbcfd72a6 files/postgresql-8.3-regress.patch 1894
-SHA256 874d9aec37e4950608e8e23fbc8a7982d8e7c020c84e308d1755d485c99e2029 files/postgresql-8.3-regress.patch 1894
-AUX postgresql-8.3-server.patch 4039 RMD160 ddf6d72a6829f541f285ff37b2f268e2b075e7da SHA1 045203f1ff5236f2cf3fdbc6c7f39698c43717f5 SHA256 61727bfe8e1a8b3e4f28c6b8081e779cbd472492aaae5f96dd5e66ffd3d5fa0d
-MD5 310b478b965d3fa6a24865548b8ce959 files/postgresql-8.3-server.patch 4039
-RMD160 ddf6d72a6829f541f285ff37b2f268e2b075e7da files/postgresql-8.3-server.patch 4039
-SHA256 61727bfe8e1a8b3e4f28c6b8081e779cbd472492aaae5f96dd5e66ffd3d5fa0d files/postgresql-8.3-server.patch 4039
+AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
+MD5 e1d116082e50ab3c8c00da5cff4cb5a4 files/postgresql-8.3-common.patch 2641
+RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 files/postgresql-8.3-common.patch 2641
+SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197 files/postgresql-8.3-common.patch 2641
+AUX postgresql-8.3-server.patch 5944 RMD160 a1e198aea16a19d21c454a3e9677a00751a9cf35 SHA1 a896132e246d973595dc6732492c3cd792372ccd SHA256 bb20ccecbab477315b7ee4c22a6f628e951aaa1c3ee0d36bb1771478ad59f348
+MD5 82ce8eb7041ee97b21e87513d3a854e7 files/postgresql-8.3-server.patch 5944
+RMD160 a1e198aea16a19d21c454a3e9677a00751a9cf35 files/postgresql-8.3-server.patch 5944
+SHA256 bb20ccecbab477315b7ee4c22a6f628e951aaa1c3ee0d36bb1771478ad59f348 files/postgresql-8.3-server.patch 5944
 AUX postgresql.conf-7.3 1515 RMD160 d2a5175d176bb1039a195c61762464769e86266a SHA1 7b33b242c5aa39bb56917b216aa7495c8cb3d100 SHA256 9e93fe9780bea82c9ef31f311cb556737aa940f749edf3d2a7f8dc36e12e93a4
 MD5 e2d90b6770bd37663fec2e1e3146a859 files/postgresql.conf-7.3 1515
 RMD160 d2a5175d176bb1039a195c61762464769e86266a files/postgresql.conf-7.3 1515
@@ -119,9 +115,7 @@ DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 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-base-8.3beta2.tar.bz2 9587997 RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 SHA1 cab5a2d93fe87783800683d22719717152dddc17 SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
-DIST postgresql-opt-8.3beta2.tar.bz2 178552 RMD160 33c74cec29ee085e68614712884ac9910a5d69e2 SHA1 d70db3f13d79e0d322a9c114cb1a8d8ed0f65aba SHA256 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725
-DIST postgresql-test-8.3beta2.tar.bz2 1069384 RMD160 8367c77ceb6116518b57e723aa1a060b9a4b5c5f SHA1 7b0a1d967903c8a93ca32c83f6221f5d76d5be76 SHA256 e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15
+DIST postgresql-8.3RC1.tar.bz2 13801207 RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 SHA1 b58a3a3e26198469e23829697cdc33d02b2530f5 SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a
 EBUILD postgresql-server-7.3.21.ebuild 8116 RMD160 5bad5b4f23d5d680a40a1941c7a2da61bc4fa90f SHA1 a0bbe7f4f8cb6537a8eec77a7b12614111f9662c SHA256 87db9e8bc1b910b972e0d6f450d3d6231ea1b126530d40c8d825ac7cf241c1fe
 MD5 824ab4e705584a5a8bef6e2d3cd70951 postgresql-server-7.3.21.ebuild 8116
 RMD160 5bad5b4f23d5d680a40a1941c7a2da61bc4fa90f postgresql-server-7.3.21.ebuild 8116
@@ -142,10 +136,10 @@ EBUILD postgresql-server-8.2.6.ebuild 8505 RMD160 5e62177c0dacc53c0da3d77bddca30
 MD5 f620ffb08235cee4d48b9a58fea48f34 postgresql-server-8.2.6.ebuild 8505
 RMD160 5e62177c0dacc53c0da3d77bddca301068e72d98 postgresql-server-8.2.6.ebuild 8505
 SHA256 b4eb992e22fd63fb63f1adea581c44359d24520523c96ce2aecdc4ecb22fd278 postgresql-server-8.2.6.ebuild 8505
-EBUILD postgresql-server-8.3_beta2.ebuild 8758 RMD160 5c89515a9cfefaefe30db2b62a3a801f89531578 SHA1 90aa317509ac44bfa5ed22e5636b6ffa23cac38b SHA256 a9db7083cb1b1c17d95b195aab7b0102dde1966e68c991570c29c7177cc8a74f
-MD5 72eb742d93dbf9c7f1b43ae58b490302 postgresql-server-8.3_beta2.ebuild 8758
-RMD160 5c89515a9cfefaefe30db2b62a3a801f89531578 postgresql-server-8.3_beta2.ebuild 8758
-SHA256 a9db7083cb1b1c17d95b195aab7b0102dde1966e68c991570c29c7177cc8a74f postgresql-server-8.3_beta2.ebuild 8758
+EBUILD postgresql-server-8.3_rc1.ebuild 8525 RMD160 d9f90bdab12c404356b2cdc328734fdf7e7e6121 SHA1 e081c24e0291283dad346fee714ebd3edceb1675 SHA256 c1efa666ff81b89a47ace56b0c0ac4e29e52273fd4cae5a994b0beea44ca9da8
+MD5 30deb8833f2a2a213bd8ccf3bb20f4cf postgresql-server-8.3_rc1.ebuild 8525
+RMD160 d9f90bdab12c404356b2cdc328734fdf7e7e6121 postgresql-server-8.3_rc1.ebuild 8525
+SHA256 c1efa666ff81b89a47ace56b0c0ac4e29e52273fd4cae5a994b0beea44ca9da8 postgresql-server-8.3_rc1.ebuild 8525
 MISC ChangeLog 412 RMD160 b99776c6be65236f0156bd78bf2fcaeba2b1550f SHA1 e9c8045024dd160b67736cc1283d49aa113ca7d7 SHA256 a6571ecd9b91edf7ce97759df9c320417b1e67ee7538163cffdfca05b6d167ff
 MD5 47127296a7cfb06f8b9c5768748a6c5e ChangeLog 412
 RMD160 b99776c6be65236f0156bd78bf2fcaeba2b1550f ChangeLog 412
@@ -165,6 +159,6 @@ SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/di
 MD5 82e0a8c26d6b4ca23a88e14f9c1364dd files/digest-postgresql-server-8.2.6 259
 RMD160 eaeca374a581f849a0d441e81a9a195696422978 files/digest-postgresql-server-8.2.6 259
 SHA256 dd2fd7fd45f83726f1cdcdd60e97ae51bb222030679916ff44a3f623a41930e9 files/digest-postgresql-server-8.2.6 259
-MD5 be37361e87947ea30eeed2ef6cf5ccd0 files/digest-postgresql-server-8.3_beta2 834
-RMD160 42ba26709dea79187e21af7133cfef12e6276493 files/digest-postgresql-server-8.3_beta2 834
-SHA256 9606e69f8ff1f5a2ce6a4413698f2309d30900f8a515163a11e7ec82fef344ef files/digest-postgresql-server-8.3_beta2 834
+MD5 f2a20168d6f9484e0ace623b4ce6de6e files/digest-postgresql-server-8.3_rc1 262
+RMD160 019bc970caed3347a76f9e7099c8b6a2cf70385d files/digest-postgresql-server-8.3_rc1 262
+SHA256 8584bc879e3ab91baac2b3d7a4e5041ec2e13d74a00b603272af761d88c1554a files/digest-postgresql-server-8.3_rc1 262
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.3_beta2 b/dev-db/postgresql-server/files/digest-postgresql-server-8.3_beta2
deleted file mode 100644
index 23139d1..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.3_beta2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 0430c321a9aacc2cb6c190cdccc34c78 postgresql-base-8.3beta2.tar.bz2 9587997
-RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 postgresql-base-8.3beta2.tar.bz2 9587997
-SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91 postgresql-base-8.3beta2.tar.bz2 9587997
-MD5 70a34048525224a2d7187bf23b4d25b6 postgresql-opt-8.3beta2.tar.bz2 178552
-RMD160 33c74cec29ee085e68614712884ac9910a5d69e2 postgresql-opt-8.3beta2.tar.bz2 178552
-SHA256 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725 postgresql-opt-8.3beta2.tar.bz2 178552
-MD5 5cd74896dc0d0cce0cd1abd75ab4b12d postgresql-test-8.3beta2.tar.bz2 1069384
-RMD160 8367c77ceb6116518b57e723aa1a060b9a4b5c5f postgresql-test-8.3beta2.tar.bz2 1069384
-SHA256 e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15 postgresql-test-8.3beta2.tar.bz2 1069384
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.3_rc1 b/dev-db/postgresql-server/files/digest-postgresql-server-8.3_rc1
new file mode 100644
index 0000000..9e44c24
--- /dev/null
+++ b/dev-db/postgresql-server/files/digest-postgresql-server-8.3_rc1
@@ -0,0 +1,3 @@
+MD5 c0994ab0d16aa7410d05102344f819fe postgresql-8.3RC1.tar.bz2 13801207
+RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 postgresql-8.3RC1.tar.bz2 13801207
+SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a postgresql-8.3RC1.tar.bz2 13801207
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-common.patch b/dev-db/postgresql-server/files/postgresql-8.3-common.patch
index bab8258..c9f2ad2 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-common.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-common.patch
@@ -17,8 +17,23 @@ index 9434113..d72b35c 100644
    AC_SUBST(localedir)
  ])# PGAC_CHECK_GETTEXT
  
+diff --git a/configure.in b/configure.in
+index 58cc61c..07ffc38 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.3RC1], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2008, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
 diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index a9cbeac..d5c2764 100644
+index 7d9448f..07799bc 100644
 --- a/src/include/storage/s_lock.h
 +++ b/src/include/storage/s_lock.h
 @@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-regress.patch b/dev-db/postgresql-server/files/postgresql-8.3-regress.patch
deleted file mode 100644
index 18366df..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.3-regress.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 0df7b9f..2c34021 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
- ##
- 
- 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/"
- 
- 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 741eb11..37775be 100644
---- a/src/test/regress/pg_regress.c
-+++ b/src/test/regress/pg_regress.c
-@@ -760,9 +760,6 @@ initialize_environment(void)
- 		sprintf(tmp, "%s/install/%s", temp_install, datadir);
- 		datadir = tmp;
- 
--		/* psql will be installed into temp-install bindir */
--		psqldir = bindir;
--		
- 		/*
- 		 * Set up shared library paths to include the temp install.
- 		 *
-@@ -2019,7 +2016,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
- 		 */
- 		snprintf(buf, sizeof(buf),
- 				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
--				 bindir, DEVNULL, DEVNULL);
-+				 psqldir, DEVNULL, DEVNULL);
- 		for (i = 0; i < 60; i++)
- 		{
- 			/* Done if psql succeeds */
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 9df1c46..60433fe 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -23,10 +23,10 @@ index f7bcc67..ec8fcf1 100644
  distprep:
  	$(MAKE) -C doc $@
 diff --git a/contrib/Makefile b/contrib/Makefile
-index 0bd9e65..147a27f 100644
+index c55c95c..3e9f8ba 100644
 --- a/contrib/Makefile
 +++ b/contrib/Makefile
-@@ -26,15 +26,13 @@ WANTED_DIRS = \
+@@ -26,16 +26,13 @@ WANTED_DIRS = \
  		pg_freespacemap \
  		pg_standby	\
  		pg_trgm		\
@@ -38,24 +38,25 @@ index 0bd9e65..147a27f 100644
  		spi		\
  		tablefunc	\
 -		test_parser	\
+-		tsearch2	\
 -		vacuumlo
 +		test_parser
  
  ifeq ($(with_openssl),yes)
  WANTED_DIRS += sslinfo
 diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
-index c7dad12..05a175c 100644
+index e1262fb..7e27aed 100644
 --- a/contrib/adminpack/Makefile
 +++ b/contrib/adminpack/Makefile
 @@ -1,7 +1,7 @@
- # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.5 2007/06/26 22:05:01 tgl Exp $
+ # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $
  
  MODULE_big = adminpack
 -PG_CPPFLAGS = -I$(libpq_srcdir)
 +PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/
  DATA_built = adminpack.sql
  DATA = uninstall_adminpack.sql
- DOCS = README.adminpack
+ OBJS = adminpack.o
 diff --git a/src/Makefile b/src/Makefile
 index 8d66bf6..6818ef5 100644
 --- a/src/Makefile
@@ -77,10 +78,10 @@ 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 cbe2634..f2585c3 100644
+index aa41ee9..5595990 100644
 --- a/src/Makefile.global.in
 +++ b/src/Makefile.global.in
-@@ -372,10 +372,8 @@ endif
+@@ -373,10 +373,8 @@ endif
  
  
  submake-libpq:
@@ -91,7 +92,7 @@ index cbe2634..f2585c3 100644
  
  .PHONY: submake-libpq submake-libpgport
  
-@@ -418,6 +416,8 @@ ifdef PROFILE
+@@ -419,6 +417,8 @@ ifdef PROFILE
     LDFLAGS += $(PROFILE)
  endif
  
@@ -101,7 +102,7 @@ index cbe2634..f2585c3 100644
  ##########################################################################
  #
 diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 1f319d5..846a5e7 100644
+index ec8f7ce..3f82a7f 100644
 --- a/src/bin/Makefile
 +++ b/src/bin/Makefile
 @@ -13,8 +13,8 @@ subdir = src/bin
@@ -116,7 +117,7 @@ index 1f319d5..846a5e7 100644
  DIRS+=pgevent
  endif
 diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
-index 6421cb0..3dcfa82 100644
+index eac7a09..4fcbb0f 100644
 --- a/src/bin/initdb/Makefile
 +++ b/src/bin/initdb/Makefile
 @@ -14,7 +14,7 @@ subdir = src/bin/initdb
@@ -146,3 +147,46 @@ 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
+ ##
+ 
+ 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/"
+ 
+ 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)
+ 		sprintf(tmp, "%s/install/%s", temp_install, datadir);
+ 		datadir = tmp;
+ 
+-		/* psql will be installed into temp-install bindir */
+-		psqldir = bindir;
+-
+ 		/*
+ 		 * 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
+ 		 */
+ 		snprintf(buf, sizeof(buf),
+ 				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
+-				 bindir, DEVNULL, DEVNULL);
++				 psqldir, DEVNULL, DEVNULL);
+ 		for (i = 0; i < 60; i++)
+ 		{
+ 			/* Done if psql succeeds */
diff --git a/dev-db/postgresql-server/postgresql-server-8.3_beta2.ebuild b/dev-db/postgresql-server/postgresql-server-8.3_rc1.ebuild
index 54c9061..f3cc95c 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3_beta2.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3_rc1.ebuild
@@ -10,9 +10,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
 
 DESCRIPTION="PostgreSQL server"
 HOMEPAGE="http://www.postgresql.org/"
-SRC_URI="mirror://postgresql/source/v${PV/_/}/postgresql-base-${PV/_/}.tar.bz2
-		mirror://postgresql/source/v${PV/_/}/postgresql-opt-${PV/_/}.tar.bz2
-		test? ( mirror://postgresql/source/v${PV/_/}/postgresql-test-${PV/_/}.tar.bz2 )"
+SRC_URI="mirror://postgresql/source/v${PV/_rc/RC}/postgresql-${PV/_rc/RC}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
 # find . -name \*.po | xargs -n 1 basename | cut -d. -f1|sort|uniq|sed 's/^/linguas_/'
@@ -44,12 +42,12 @@ PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )"
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
 [[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
-S="${WORKDIR}/postgresql-${PV/_/}"
+S="${WORKDIR}/postgresql-${PV/_rc/RC}"
 
 pkg_setup() {
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		if [[ $(cat "${PGDATA}/PG_VERSION") != $(get_version_component_range 1-2) ]] ; then
-			eerror "PostgreSQL ${PV/_/} cannot upgrade your existing databases, you must"
+			eerror "PostgreSQL ${PV/_rc/RC} cannot upgrade your existing databases, you must"
 			eerror "use pg_dump to export your existing databases to a file, and then"
 			eerror "pg_restore to import them when you have upgraded completely."
 			eerror "You must remove your entire database directory to continue."
@@ -69,10 +67,8 @@ src_unpack() {
 	epatch "${FILESDIR}/postgresql-${SLOT}-server.patch"
 
 	if use test ; then
-		epatch "${FILESDIR}/postgresql-${SLOT}-regress.patch"
 		sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source
 	else
-		mkdir -p "${S}/src/test/regress"
 		echo "all install:" > "${S}/src/test/regress/GNUmakefile"
 	fi