6 files changed, 43 insertions, 32 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}