dev-db/postgresql*: bump 8.2* to 8.2.6

svn path=/experimental/; revision=305

34 files changed, 436 insertions, 339 deletions

diff --git a/dev-db/postgresql-client/Manifest b/dev-db/postgresql-client/Manifest
index 3bd1140..d529007 100644
--- a/dev-db/postgresql-client/Manifest
+++ b/dev-db/postgresql-client/Manifest
@@ -46,18 +46,14 @@ AUX postgresql-8.1-common.patch 2290 RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb
 MD5 824168c489f9f0c020e3ec9a0bbf7329 files/postgresql-8.1-common.patch 2290
 RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb8cf6 files/postgresql-8.1-common.patch 2290
 SHA256 f80c8dd5a31b88df330c15de4331db1600ae078a789650ab28d61620f27056f5 files/postgresql-8.1-common.patch 2290
-AUX postgresql-8.2-client.patch 2351 RMD160 b862a18b567372382d74567039cafb83c50b2917 SHA1 067b18d66c9f8f9a8ba61130a7e53210efa9e07d SHA256 95ecea56c62ee13dd13fd48804046c96b037e6a63a28175e70f3df6961ec7a4d
-MD5 988674e8bc89022a92a5bfdf02f59d61 files/postgresql-8.2-client.patch 2351
-RMD160 b862a18b567372382d74567039cafb83c50b2917 files/postgresql-8.2-client.patch 2351
-SHA256 95ecea56c62ee13dd13fd48804046c96b037e6a63a28175e70f3df6961ec7a4d files/postgresql-8.2-client.patch 2351
-AUX postgresql-8.2-nls.patch 694 RMD160 7bf8b223f2da3af437eb168eebaf5dcdfcf01dac SHA1 f7b289d67e7c17d21006a780d117d27036aa1ada SHA256 be7d52faaf4eb66b2959bd5709b67b37fa685284734bb8bfc73caef667392669
-MD5 98fd6b000ddcb406647f3da6ae8c5b01 files/postgresql-8.2-nls.patch 694
-RMD160 7bf8b223f2da3af437eb168eebaf5dcdfcf01dac files/postgresql-8.2-nls.patch 694
-SHA256 be7d52faaf4eb66b2959bd5709b67b37fa685284734bb8bfc73caef667392669 files/postgresql-8.2-nls.patch 694
-AUX postgresql-8.2-no-interfaces.patch 430 RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 SHA1 db70a0103d57bb2044f38fb0684328b80e365304 SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5
-MD5 486acb579010282ead6c424c6fb46ba1 files/postgresql-8.2-no-interfaces.patch 430
-RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 files/postgresql-8.2-no-interfaces.patch 430
-SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5 files/postgresql-8.2-no-interfaces.patch 430
+AUX postgresql-8.2-client.patch 2784 RMD160 be0029fef2bb08598b304ef9484de1a57d608e47 SHA1 f7f631a5ee657a42a079318240a07742bec8fbd9 SHA256 da45ba885a0cfefac40a308a00fc0fbb2374888eb724115bbbed6c305d300668
+MD5 96ac74e5f1fdd08fbac85df2d4abe066 files/postgresql-8.2-client.patch 2784
+RMD160 be0029fef2bb08598b304ef9484de1a57d608e47 files/postgresql-8.2-client.patch 2784
+SHA256 da45ba885a0cfefac40a308a00fc0fbb2374888eb724115bbbed6c305d300668 files/postgresql-8.2-client.patch 2784
+AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
+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
@@ -70,9 +66,8 @@ DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c0560
 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-base-8.2.5.tar.bz2 8602348 RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 SHA1 437b5e0144485be16557cbb3d48102063e7df69d SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+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.2.5.tar.bz2 167549 RMD160 92f6ee646eaf0268ee165fd592013cc3acaee5ca SHA1 bc1bf7528033bc17ae4e93ed071dd2b40bd19f94 SHA256 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
 DIST postgresql-opt-8.3beta2.tar.bz2 178552 RMD160 33c74cec29ee085e68614712884ac9910a5d69e2 SHA1 d70db3f13d79e0d322a9c114cb1a8d8ed0f65aba SHA256 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725
 EBUILD postgresql-client-7.3.21.ebuild 2741 RMD160 95352563cd90c82dfd2f1c3854a559ecbace2429 SHA1 9b1ca0d41e5b2f1b0202ef2615ce0d24fea9bc18 SHA256 64cb434f98ea2ab9e9c3f9524fba0e9de050aace5a97d72a081fcb6d4164db86
 MD5 00dbe64954d96e4bb8032a63d03b83c4 postgresql-client-7.3.21.ebuild 2741
@@ -90,10 +85,10 @@ EBUILD postgresql-client-8.1.11.ebuild 3128 RMD160 a8787491081f8a2dc5acbe6f506e2
 MD5 0ba90eff54dd418f84a5b3446776c32b postgresql-client-8.1.11.ebuild 3128
 RMD160 a8787491081f8a2dc5acbe6f506e299fab47fd12 postgresql-client-8.1.11.ebuild 3128
 SHA256 98a8fcf86de53fa534445e1a2affcc34f98e331382c27b13c9ca0a7909902611 postgresql-client-8.1.11.ebuild 3128
-EBUILD postgresql-client-8.2.5.ebuild 3377 RMD160 66c666c7e8b7b706c0fc2b7d02546a3e2e87adc6 SHA1 f20537f6b7a0ee95ce459ec3a2bedbbe150927b0 SHA256 ab440a35fa18ef677c23f518dfb202ed8980541fdc787b66d2340bd582840f3d
-MD5 73d8bd67a02c795e87569f8f03d50685 postgresql-client-8.2.5.ebuild 3377
-RMD160 66c666c7e8b7b706c0fc2b7d02546a3e2e87adc6 postgresql-client-8.2.5.ebuild 3377
-SHA256 ab440a35fa18ef677c23f518dfb202ed8980541fdc787b66d2340bd582840f3d postgresql-client-8.2.5.ebuild 3377
+EBUILD postgresql-client-8.2.6.ebuild 3250 RMD160 6d1a93dc11ddef86f7e64ed4faf5b56d4c6c3051 SHA1 b003b2e83967a9cbc7c9f574229e39a99d83f1e0 SHA256 39acd92db3792df8170f740ee13d66ae24a70e0fdd5f6a7f2adc66b5e29d0d0e
+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
@@ -114,9 +109,9 @@ SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/di
 MD5 8e0b9ba7ccb589a185904e1b7e564181 files/digest-postgresql-client-8.1.11 262
 RMD160 7f74888cad6f2898b7066b15796e33793986bfc7 files/digest-postgresql-client-8.1.11 262
 SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/digest-postgresql-client-8.1.11 262
-MD5 e0c4c34fcfcd7245c57be1d6994f5796 files/digest-postgresql-client-8.2.5 536
-RMD160 2f36804d0f2efac3a4987b2433f82414084e9d18 files/digest-postgresql-client-8.2.5 536
-SHA256 84d7927d6ea44f7f8e04b546ac47e46c509f2c0dc6e8c00f9748db34b789e8fd files/digest-postgresql-client-8.2.5 536
+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
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.2.5 b/dev-db/postgresql-client/files/digest-postgresql-client-8.2.5
deleted file mode 100644
index b8ab94d..0000000
--- a/dev-db/postgresql-client/files/digest-postgresql-client-8.2.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5879b205b635f3fb905f6015c50f4edd postgresql-base-8.2.5.tar.bz2 8602348
-RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 postgresql-base-8.2.5.tar.bz2 8602348
-SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929 postgresql-base-8.2.5.tar.bz2 8602348
-MD5 dea12379311886d825fe7090884521b7 postgresql-opt-8.2.5.tar.bz2 167549
-RMD160 92f6ee646eaf0268ee165fd592013cc3acaee5ca postgresql-opt-8.2.5.tar.bz2 167549
-SHA256 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5 postgresql-opt-8.2.5.tar.bz2 167549
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.2.6 b/dev-db/postgresql-client/files/digest-postgresql-client-8.2.6
new file mode 100644
index 0000000..eb9626c
--- /dev/null
+++ b/dev-db/postgresql-client/files/digest-postgresql-client-8.2.6
@@ -0,0 +1,3 @@
+MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
+RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
+SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117
diff --git a/dev-db/postgresql-client/files/postgresql-8.2-client.patch b/dev-db/postgresql-client/files/postgresql-8.2-client.patch
index de74d76..3250484 100644
--- a/dev-db/postgresql-client/files/postgresql-8.2-client.patch
+++ b/dev-db/postgresql-client/files/postgresql-8.2-client.patch
@@ -2,7 +2,7 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in
 index 16f9057..0f6cee7 100644
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.glo
+@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
  all:
  	$(MAKE) -C doc all
  	$(MAKE) -C src all
@@ -88,6 +88,23 @@ index 6d9043a..5099025 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 820dfd5..2619acd 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -365,10 +365,10 @@ endif
+ 
+ 
+ submake-libpq:
+-	$(MAKE) -C $(libpq_builddir) all
++	@true $(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport:
+-	$(MAKE) -C $(top_builddir)/src/port all
++	@true $(MAKE) -C $(top_builddir)/src/port all
+ 
+ .PHONY: submake-libpq submake-libpgport
+ 
 diff --git a/src/bin/Makefile b/src/bin/Makefile
 index 0d86213..5dba7c8 100644
 --- a/src/bin/Makefile
diff --git a/dev-db/postgresql-client/files/postgresql-8.2-common.patch b/dev-db/postgresql-client/files/postgresql-8.2-common.patch
new file mode 100644
index 0000000..e6e8e46
--- /dev/null
+++ b/dev-db/postgresql-client/files/postgresql-8.2-common.patch
@@ -0,0 +1,88 @@
+diff --git a/config/programs.m4 b/config/programs.m4
+index fb9793f..3510942 100644
+--- a/config/programs.m4
++++ b/config/programs.m4
+@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
+ dnl FIXME: We should probably check for version >=0.10.36.
+   AC_CHECK_PROGS(XGETTEXT, xgettext)
+ 
+-  # Note: share/locale is always the default, independent of $datadir
+-  localedir='${prefix}/share/locale'
++  # Note: share/locale *WAS* always the default, independent of $datadir
++  AC_ARG_WITH([locale-dir],
++   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
++   [ localedir="${withval}" ],
++   [ localedir='${prefix}/share/locale' ]
++  )
+   AC_SUBST(localedir)
+ ])# PGAC_CHECK_GETTEXT
+ 
+diff --git a/configure.in b/configure.in
+index 908a1ae..30dd3bb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.2.6], [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-2006, 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 23f4cc9..707c303 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
+ 
+ #endif	 /* __s390__ || __s390x__ */
+ 
++#if defined(__sh__)
++#define HAS_TEST_AND_SET
++
++typedef unsigned char slock_t;
++
++#define TAS(lock) tas(lock)
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++	register int _res = 1;
++
++	__asm__ __volatile__(
++		"tas.b	@%1\n\t"
++		"movt	%0\n\t"
++		"xor	#1,%0"
++:		"=z"(_res)
++:		"r"(lock)
++:		"t","memory");
++	return _res;
++}
++
++#endif	 /* __sh__ */
+ 
+ #if defined(__sparc__)		/* Sparc */
+ #define HAS_TEST_AND_SET
+diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
+index 9f761d4..83b2974 100644
+--- a/src/makefiles/Makefile.darwin
++++ b/src/makefiles/Makefile.darwin
+@@ -5,7 +5,15 @@ DLSUFFIX = .so
+ CFLAGS_SL =
+ 
+ ifdef PGXS
++ifdef PGXS_IN_SERVER
++ifndef PGXS_WITH_SERVER
++BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
++else
++BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
++endif
++else
+ BE_DLLLIBS= -bundle_loader $(bindir)/postgres
++endif
+ else
+ BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
+ endif
diff --git a/dev-db/postgresql-client/files/postgresql-8.2-nls.patch b/dev-db/postgresql-client/files/postgresql-8.2-nls.patch
deleted file mode 100644
index 983bc87..0000000
--- a/dev-db/postgresql-client/files/postgresql-8.2-nls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index fb9793f..3510942 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
- dnl FIXME: We should probably check for version >=0.10.36.
-   AC_CHECK_PROGS(XGETTEXT, xgettext)
- 
--  # Note: share/locale is always the default, independent of $datadir
--  localedir='${prefix}/share/locale'
-+  # Note: share/locale *WAS* always the default, independent of $datadir
-+  AC_ARG_WITH([locale-dir],
-+   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
-+   [ localedir="${withval}" ],
-+   [ localedir='${prefix}/share/locale' ]
-+  )
-   AC_SUBST(localedir)
- ])# PGAC_CHECK_GETTEXT
- 
diff --git a/dev-db/postgresql-client/files/postgresql-8.2-no-interfaces.patch b/dev-db/postgresql-client/files/postgresql-8.2-no-interfaces.patch
deleted file mode 100644
index 897388e..0000000
--- a/dev-db/postgresql-client/files/postgresql-8.2-no-interfaces.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index 820dfd5..2619acd 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -365,10 +365,10 @@ endif
- 
- 
- submake-libpq:
--	$(MAKE) -C $(libpq_builddir) all
-+	@true $(MAKE) -C $(libpq_builddir) all
- 
- submake-libpgport:
--	$(MAKE) -C $(top_builddir)/src/port all
-+	@true $(MAKE) -C $(top_builddir)/src/port all
- 
- .PHONY: submake-libpq submake-libpgport
- 
diff --git a/dev-db/postgresql-client/postgresql-client-8.2.5.ebuild b/dev-db/postgresql-client/postgresql-client-8.2.6.ebuild
index c38c896..465b175 100644
--- a/dev-db/postgresql-client/postgresql-client-8.2.5.ebuild
+++ b/dev-db/postgresql-client/postgresql-client-8.2.6.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}/postgresql-${PV}.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_/'
@@ -39,9 +38,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
+	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-client.patch"
-	epatch "${FILESDIR}/postgresql-${SLOT}-no-interfaces.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
diff --git a/dev-db/postgresql-docs/Manifest b/dev-db/postgresql-docs/Manifest
index 11cbccd..a13b03b 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -2,7 +2,7 @@ DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c0560
 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-docs-8.2.5.tar.bz2 2773777 RMD160 56cdea05e6b162f21b021df807f6051102d14b75 SHA1 14f8051f8a548615357a2b89223cdb15d1817e9f SHA256 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
+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
 EBUILD postgresql-docs-7.3.21.ebuild 1001 RMD160 34a77ce99efce34aa5f31004339004e794bbff1e SHA1 b40fa0250e5c01c25d3e21c7bb43e09d639fb246 SHA256 bdf70e28c20d2c458e83ea6c77a4c20b0bbbdb556c4051e70dbbb57e2c4afede
 MD5 b6b80a6c42dd126374ef4d6072880fda postgresql-docs-7.3.21.ebuild 1001
@@ -20,10 +20,10 @@ EBUILD postgresql-docs-8.1.11.ebuild 1001 RMD160 05ad8bcc2c5a42ebe2145e80456af8e
 MD5 a632c1d2ac6914ccacd4e4c1a9d1dd00 postgresql-docs-8.1.11.ebuild 1001
 RMD160 05ad8bcc2c5a42ebe2145e80456af8e866b71081 postgresql-docs-8.1.11.ebuild 1001
 SHA256 ad030ede527b1de68db40be539ed85f5f3dbb79b71e6d0c40cdec785567777fa postgresql-docs-8.1.11.ebuild 1001
-EBUILD postgresql-docs-8.2.5.ebuild 984 RMD160 d68961341171537373b0106f15ae5cd284cf0db7 SHA1 d62fbad009d7f59c8d054c9f31bad81f2d7f75c8 SHA256 064ee0f6ea1b3ac997486941a54fb68c7672ecf3896f436f7abf3bbbe40b6179
-MD5 356b4ec292b3aada0faaa407050ce2c6 postgresql-docs-8.2.5.ebuild 984
-RMD160 d68961341171537373b0106f15ae5cd284cf0db7 postgresql-docs-8.2.5.ebuild 984
-SHA256 064ee0f6ea1b3ac997486941a54fb68c7672ecf3896f436f7abf3bbbe40b6179 postgresql-docs-8.2.5.ebuild 984
+EBUILD postgresql-docs-8.2.6.ebuild 1001 RMD160 05ad8bcc2c5a42ebe2145e80456af8e866b71081 SHA1 1cf3d6b064fca4a0119ce5bdc232d8b8dae0fc7a SHA256 ad030ede527b1de68db40be539ed85f5f3dbb79b71e6d0c40cdec785567777fa
+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
@@ -40,9 +40,9 @@ SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/di
 MD5 8e0b9ba7ccb589a185904e1b7e564181 files/digest-postgresql-docs-8.1.11 262
 RMD160 7f74888cad6f2898b7066b15796e33793986bfc7 files/digest-postgresql-docs-8.1.11 262
 SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/digest-postgresql-docs-8.1.11 262
-MD5 fcf8056840b94638da7c58f183b9c202 files/digest-postgresql-docs-8.2.5 271
-RMD160 fdaca969ceec7557662d111280b1269c685b11f6 files/digest-postgresql-docs-8.2.5 271
-SHA256 f6a678eeee1c85b3d1cdf727f6f1c35959d666f0b3946faf1536cc80fdee7114 files/digest-postgresql-docs-8.2.5 271
+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
diff --git a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.2.5 b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.2.5
deleted file mode 100644
index 96b9da5..0000000
--- a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d9edbcbebd620dbeaa42a04c0a2fd900 postgresql-docs-8.2.5.tar.bz2 2773777
-RMD160 56cdea05e6b162f21b021df807f6051102d14b75 postgresql-docs-8.2.5.tar.bz2 2773777
-SHA256 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d postgresql-docs-8.2.5.tar.bz2 2773777
diff --git a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.2.6 b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.2.6
new file mode 100644
index 0000000..eb9626c
--- /dev/null
+++ b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.2.6
@@ -0,0 +1,3 @@
+MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
+RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
+SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.2.5.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.2.6.ebuild
index 6cbd7fa..a04391d 100644
--- a/dev-db/postgresql-docs/postgresql-docs-8.2.5.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-8.2.6.ebuild
@@ -8,7 +8,7 @@ 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}/postgresql-${PV}.tar.bz2"
 LICENSE="POSTGRESQL"
 SLOT="$(get_version_component_range 1-2)"
 IUSE=""
@@ -17,6 +17,10 @@ DEPEND=""
 
 S="${WORKDIR}/postgresql-${PV}"
 
+src_compile() {
+	:
+}
+
 src_install() {
 	dodir /usr/share/doc/${PF}/html
 	tar -zxf "${S}/doc/postgres.tar.gz" -C "${D}/usr/share/doc/${PF}/html"
diff --git a/dev-db/postgresql-libs/Manifest b/dev-db/postgresql-libs/Manifest
index a3eb708..00049ba 100644
--- a/dev-db/postgresql-libs/Manifest
+++ b/dev-db/postgresql-libs/Manifest
@@ -34,22 +34,14 @@ AUX postgresql-8.1-libs.patch 3362 RMD160 717aec6bba86eb6843facd6edc0b44853afb07
 MD5 b32bda6bff919622d80502647a95b702 files/postgresql-8.1-libs.patch 3362
 RMD160 717aec6bba86eb6843facd6edc0b44853afb0768 files/postgresql-8.1-libs.patch 3362
 SHA256 92775273222907f1dfdd4b000ae3c8368567c1426bff0fa02cff385254b9013d files/postgresql-8.1-libs.patch 3362
-AUX postgresql-8.2-darwin-build.patch 547 RMD160 fd6bbe4e7b577e84547b05302fb0a228473bb4c8 SHA1 aa64db379b78ea0ae86bed2f853d31b29caaef36 SHA256 a722564a16023c4e74592c298859cfbeef178c859cd2edec310ddc33a3b70858
-MD5 871d8e4a6bc42c21c4eb764f4f3aee16 files/postgresql-8.2-darwin-build.patch 547
-RMD160 fd6bbe4e7b577e84547b05302fb0a228473bb4c8 files/postgresql-8.2-darwin-build.patch 547
-SHA256 a722564a16023c4e74592c298859cfbeef178c859cd2edec310ddc33a3b70858 files/postgresql-8.2-darwin-build.patch 547
-AUX postgresql-8.2-libs.patch 3345 RMD160 26f5686c385e75cf589e11488998575a9faf62ee SHA1 0f11a643e75c90311931daa24d687d1a1f780842 SHA256 aeb02731163abd3f5245f5a3af514ca9447329d520f8c8e6fd916f39712350a8
-MD5 811b8424f9f068c90a0998b7702121ed files/postgresql-8.2-libs.patch 3345
-RMD160 26f5686c385e75cf589e11488998575a9faf62ee files/postgresql-8.2-libs.patch 3345
-SHA256 aeb02731163abd3f5245f5a3af514ca9447329d520f8c8e6fd916f39712350a8 files/postgresql-8.2-libs.patch 3345
-AUX postgresql-8.2-nls.patch 694 RMD160 7bf8b223f2da3af437eb168eebaf5dcdfcf01dac SHA1 f7b289d67e7c17d21006a780d117d27036aa1ada SHA256 be7d52faaf4eb66b2959bd5709b67b37fa685284734bb8bfc73caef667392669
-MD5 98fd6b000ddcb406647f3da6ae8c5b01 files/postgresql-8.2-nls.patch 694
-RMD160 7bf8b223f2da3af437eb168eebaf5dcdfcf01dac files/postgresql-8.2-nls.patch 694
-SHA256 be7d52faaf4eb66b2959bd5709b67b37fa685284734bb8bfc73caef667392669 files/postgresql-8.2-nls.patch 694
-AUX postgresql-8.2-sh-spinlocks.patch 689 RMD160 f761e56ab00296569fea9756a775c9bbfdc991ed SHA1 435ddd4d79b7dbac7a71dd2e5a7426fd262e82e0 SHA256 c127f9d37268d528179ad1e2e3b40bed3ff32d15ad84cabb5fa1e3766b65187c
-MD5 df96c5912efc296d57c7bfba736e065d files/postgresql-8.2-sh-spinlocks.patch 689
-RMD160 f761e56ab00296569fea9756a775c9bbfdc991ed files/postgresql-8.2-sh-spinlocks.patch 689
-SHA256 c127f9d37268d528179ad1e2e3b40bed3ff32d15ad84cabb5fa1e3766b65187c files/postgresql-8.2-sh-spinlocks.patch 689
+AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
+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.2-libs.patch 3399 RMD160 06674b5a524ab321b301965e1493ba7a09ab32cc SHA1 71ae3a6ce2a34d8d90d04109001b1b3e4eecaae4 SHA256 bf56f69add42b84646346310266e0f14b8cc02a71d6ade96a2f7a05158f4aabd
+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
@@ -62,9 +54,8 @@ DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c0560
 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-base-8.2.5.tar.bz2 8602348 RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 SHA1 437b5e0144485be16557cbb3d48102063e7df69d SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+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.2.5.tar.bz2 987137 RMD160 0acc94206384bcd784bd2d35e9d5b9c256e24db0 SHA1 cd5da8abcee439ff4d613951293d48ea432274da SHA256 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
 DIST postgresql-test-8.3beta2.tar.bz2 1069384 RMD160 8367c77ceb6116518b57e723aa1a060b9a4b5c5f SHA1 7b0a1d967903c8a93ca32c83f6221f5d76d5be76 SHA256 e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15
 EBUILD postgresql-libs-7.3.21.ebuild 3891 RMD160 bc286ee2a82197968d4dd680e39b4135a311d0b1 SHA1 6f881bedae696aa0962f933c89b1cf60a4ae4ebd SHA256 be30b4ca67bdd2a05f94720e6be36cde11f5d1a3ff3d93fd143a72891ad72186
 MD5 6c5897a042fa47c614443560a17c4135 postgresql-libs-7.3.21.ebuild 3891
@@ -82,10 +73,10 @@ EBUILD postgresql-libs-8.1.11.ebuild 4036 RMD160 df1e09bf927c7a99fa23497e14b9520
 MD5 a3719c6a81b6d46d2c563998aa9ccb1f postgresql-libs-8.1.11.ebuild 4036
 RMD160 df1e09bf927c7a99fa23497e14b9520e709c0876 postgresql-libs-8.1.11.ebuild 4036
 SHA256 1ab1f618c0c7dab8f11dcdbf5ca9ec9de46bc4a931bdb4f4f50cd2034782024a postgresql-libs-8.1.11.ebuild 4036
-EBUILD postgresql-libs-8.2.5.ebuild 4312 RMD160 1b485a5a7c3fff53f7254720641e4971583674b2 SHA1 835f7436ad0ad3ec6b3a751fa8de1caa1c4eae38 SHA256 e6b3d0fb26df992d60679c36db04b4ee72deebbf9a4db21e3f999abcf93bb6aa
-MD5 2c3b66ef93a65b6d3f4dbe2b4e935b9e postgresql-libs-8.2.5.ebuild 4312
-RMD160 1b485a5a7c3fff53f7254720641e4971583674b2 postgresql-libs-8.2.5.ebuild 4312
-SHA256 e6b3d0fb26df992d60679c36db04b4ee72deebbf9a4db21e3f999abcf93bb6aa postgresql-libs-8.2.5.ebuild 4312
+EBUILD postgresql-libs-8.2.6.ebuild 4111 RMD160 9c521cdada7e9eaca58f5c22795a936391eca5f3 SHA1 23e81441da626c31f51ffe504e5fd1ecfbe738a9 SHA256 e814e91652e743b3949f91a2e46cdd657d9b955e0b23a7a928943b92c5c7f27c
+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
@@ -110,9 +101,9 @@ SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/di
 MD5 8e0b9ba7ccb589a185904e1b7e564181 files/digest-postgresql-libs-8.1.11 262
 RMD160 7f74888cad6f2898b7066b15796e33793986bfc7 files/digest-postgresql-libs-8.1.11 262
 SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/digest-postgresql-libs-8.1.11 262
-MD5 6e1efa939604f92f7977a9286b0af036 files/digest-postgresql-libs-8.2.5 539
-RMD160 727f0bb1c8327df057e3d2f52046018bc53e0ea7 files/digest-postgresql-libs-8.2.5 539
-SHA256 da3566d147b837af1a2485e53c8cebf2df2778d85358686478a8b1ec6d5520a0 files/digest-postgresql-libs-8.2.5 539
+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
diff --git a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.2.5 b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.2.5
deleted file mode 100644
index 480b3f9..0000000
--- a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.2.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5879b205b635f3fb905f6015c50f4edd postgresql-base-8.2.5.tar.bz2 8602348
-RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 postgresql-base-8.2.5.tar.bz2 8602348
-SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929 postgresql-base-8.2.5.tar.bz2 8602348
-MD5 a4d39451e13cef32df96df35e24643cb postgresql-test-8.2.5.tar.bz2 987137
-RMD160 0acc94206384bcd784bd2d35e9d5b9c256e24db0 postgresql-test-8.2.5.tar.bz2 987137
-SHA256 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752 postgresql-test-8.2.5.tar.bz2 987137
diff --git a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.2.6 b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.2.6
new file mode 100644
index 0000000..eb9626c
--- /dev/null
+++ b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.2.6
@@ -0,0 +1,3 @@
+MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
+RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
+SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117
diff --git a/dev-db/postgresql-libs/files/postgresql-8.2-common.patch b/dev-db/postgresql-libs/files/postgresql-8.2-common.patch
new file mode 100644
index 0000000..e6e8e46
--- /dev/null
+++ b/dev-db/postgresql-libs/files/postgresql-8.2-common.patch
@@ -0,0 +1,88 @@
+diff --git a/config/programs.m4 b/config/programs.m4
+index fb9793f..3510942 100644
+--- a/config/programs.m4
++++ b/config/programs.m4
+@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
+ dnl FIXME: We should probably check for version >=0.10.36.
+   AC_CHECK_PROGS(XGETTEXT, xgettext)
+ 
+-  # Note: share/locale is always the default, independent of $datadir
+-  localedir='${prefix}/share/locale'
++  # Note: share/locale *WAS* always the default, independent of $datadir
++  AC_ARG_WITH([locale-dir],
++   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
++   [ localedir="${withval}" ],
++   [ localedir='${prefix}/share/locale' ]
++  )
+   AC_SUBST(localedir)
+ ])# PGAC_CHECK_GETTEXT
+ 
+diff --git a/configure.in b/configure.in
+index 908a1ae..30dd3bb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.2.6], [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-2006, 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 23f4cc9..707c303 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
+ 
+ #endif	 /* __s390__ || __s390x__ */
+ 
++#if defined(__sh__)
++#define HAS_TEST_AND_SET
++
++typedef unsigned char slock_t;
++
++#define TAS(lock) tas(lock)
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++	register int _res = 1;
++
++	__asm__ __volatile__(
++		"tas.b	@%1\n\t"
++		"movt	%0\n\t"
++		"xor	#1,%0"
++:		"=z"(_res)
++:		"r"(lock)
++:		"t","memory");
++	return _res;
++}
++
++#endif	 /* __sh__ */
+ 
+ #if defined(__sparc__)		/* Sparc */
+ #define HAS_TEST_AND_SET
+diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
+index 9f761d4..83b2974 100644
+--- a/src/makefiles/Makefile.darwin
++++ b/src/makefiles/Makefile.darwin
+@@ -5,7 +5,15 @@ DLSUFFIX = .so
+ CFLAGS_SL =
+ 
+ ifdef PGXS
++ifdef PGXS_IN_SERVER
++ifndef PGXS_WITH_SERVER
++BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
++else
++BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
++endif
++else
+ BE_DLLLIBS= -bundle_loader $(bindir)/postgres
++endif
+ else
+ BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
+ endif
diff --git a/dev-db/postgresql-libs/files/postgresql-8.2-darwin-build.patch b/dev-db/postgresql-libs/files/postgresql-8.2-darwin-build.patch
deleted file mode 100644
index 5c9d509..0000000
--- a/dev-db/postgresql-libs/files/postgresql-8.2-darwin-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
-index 9f761d4..83b2974 100644
---- a/src/makefiles/Makefile.darwin
-+++ b/src/makefiles/Makefile.darwin
-@@ -5,7 +5,15 @@ DLSUFFIX = .so
- CFLAGS_SL =
- 
- ifdef PGXS
-+ifdef PGXS_IN_SERVER
-+ifndef PGXS_WITH_SERVER
-+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
-+else
-+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
-+endif
-+else
- BE_DLLLIBS= -bundle_loader $(bindir)/postgres
-+endif
- else
- BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- endif
diff --git a/dev-db/postgresql-libs/files/postgresql-8.2-libs.patch b/dev-db/postgresql-libs/files/postgresql-8.2-libs.patch
index f7130c8..a57c8be 100644
--- a/dev-db/postgresql-libs/files/postgresql-8.2-libs.patch
+++ b/dev-db/postgresql-libs/files/postgresql-8.2-libs.patch
@@ -46,7 +46,7 @@ diff --git a/src/backend/Makefile b/src/backend/Makefile
 index 9329db0..abbb8f9 100644
 --- a/src/backend/Makefile
 +++ b/src/backend/Makefile
-@@ -33,7 +33,7 @@ LIBS := $(filter-out -lz -lreadline -led
+@@ -33,7 +33,7 @@ LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS)
  
  ##########################################################################
  
@@ -55,7 +55,7 @@ index 9329db0..abbb8f9 100644
  
  ifneq ($(PORTNAME), cygwin)
  ifneq ($(PORTNAME), win32)
-@@ -105,8 +105,7 @@ # Parallel make trickery
+@@ -105,8 +105,7 @@ $(SUBSYSOBJS): $(DIRS:%=%-recursive) ;
  
  .PHONY: $(DIRS:%=%-recursive)
  # Update the commonly used headers before building the subdirectories
diff --git a/dev-db/postgresql-libs/files/postgresql-8.2-nls.patch b/dev-db/postgresql-libs/files/postgresql-8.2-nls.patch
deleted file mode 100644
index 983bc87..0000000
--- a/dev-db/postgresql-libs/files/postgresql-8.2-nls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index fb9793f..3510942 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
- dnl FIXME: We should probably check for version >=0.10.36.
-   AC_CHECK_PROGS(XGETTEXT, xgettext)
- 
--  # Note: share/locale is always the default, independent of $datadir
--  localedir='${prefix}/share/locale'
-+  # Note: share/locale *WAS* always the default, independent of $datadir
-+  AC_ARG_WITH([locale-dir],
-+   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
-+   [ localedir="${withval}" ],
-+   [ localedir='${prefix}/share/locale' ]
-+  )
-   AC_SUBST(localedir)
- ])# PGAC_CHECK_GETTEXT
- 
diff --git a/dev-db/postgresql-libs/files/postgresql-8.2-sh-spinlocks.patch b/dev-db/postgresql-libs/files/postgresql-8.2-sh-spinlocks.patch
deleted file mode 100644
index 292c329..0000000
--- a/dev-db/postgresql-libs/files/postgresql-8.2-sh-spinlocks.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index 23f4cc9..707c303 100644
---- a/src/include/storage/s_lock.h
-+++ b/src/include/storage/s_lock.h
-@@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
- 
- #endif	 /* __s390__ || __s390x__ */
- 
-+#if defined(__sh__)
-+#define HAS_TEST_AND_SET
-+
-+typedef unsigned char slock_t;
-+
-+#define TAS(lock) tas(lock)
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+	register int _res = 1;
-+
-+	__asm__ __volatile__(
-+		"tas.b	@%1\n\t"
-+		"movt	%0\n\t"
-+		"xor	#1,%0"
-+:		"=z"(_res)
-+:		"r"(lock)
-+:		"t","memory");
-+	return _res;
-+}
-+
-+#endif	 /* __sh__ */
- 
- #if defined(__sparc__)		/* Sparc */
- #define HAS_TEST_AND_SET
diff --git a/dev-db/postgresql-libs/postgresql-libs-8.2.5.ebuild b/dev-db/postgresql-libs/postgresql-libs-8.2.6.ebuild
index ece3dc8..5a53800 100644
--- a/dev-db/postgresql-libs/postgresql-libs-8.2.5.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-8.2.6.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}/postgresql-${PV}.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_/'
@@ -47,10 +46,8 @@ S="${WORKDIR}/postgresql-${PV}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
-	epatch "${FILESDIR}/postgresql-${SLOT}-sh-spinlocks.patch"
+	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-libs.patch"
-	epatch "${FILESDIR}/postgresql-${SLOT}-darwin-build.patch"
 
 	# to avoid collision - it only should be installed by server
 	rm "${S}/src/backend/nls.mk"
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index ca37db6..18311b6 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -46,26 +46,14 @@ AUX postgresql-8.1-server.patch 6546 RMD160 62dcae54757e71616d9c9c37afde0ed3b0a5
 MD5 2de8d21973fb1c1ef0329b5f64245a4a files/postgresql-8.1-server.patch 6546
 RMD160 62dcae54757e71616d9c9c37afde0ed3b0a53b28 files/postgresql-8.1-server.patch 6546
 SHA256 82470c7156757fe5005d7ec6c3216f1b32f39d1344ddff012ff59e94e9893f14 files/postgresql-8.1-server.patch 6546
-AUX postgresql-8.2-darwin-build.patch 547 RMD160 fd6bbe4e7b577e84547b05302fb0a228473bb4c8 SHA1 aa64db379b78ea0ae86bed2f853d31b29caaef36 SHA256 a722564a16023c4e74592c298859cfbeef178c859cd2edec310ddc33a3b70858
-MD5 871d8e4a6bc42c21c4eb764f4f3aee16 files/postgresql-8.2-darwin-build.patch 547
-RMD160 fd6bbe4e7b577e84547b05302fb0a228473bb4c8 files/postgresql-8.2-darwin-build.patch 547
-SHA256 a722564a16023c4e74592c298859cfbeef178c859cd2edec310ddc33a3b70858 files/postgresql-8.2-darwin-build.patch 547
-AUX postgresql-8.2-nls.patch 694 RMD160 7bf8b223f2da3af437eb168eebaf5dcdfcf01dac SHA1 f7b289d67e7c17d21006a780d117d27036aa1ada SHA256 be7d52faaf4eb66b2959bd5709b67b37fa685284734bb8bfc73caef667392669
-MD5 98fd6b000ddcb406647f3da6ae8c5b01 files/postgresql-8.2-nls.patch 694
-RMD160 7bf8b223f2da3af437eb168eebaf5dcdfcf01dac files/postgresql-8.2-nls.patch 694
-SHA256 be7d52faaf4eb66b2959bd5709b67b37fa685284734bb8bfc73caef667392669 files/postgresql-8.2-nls.patch 694
-AUX postgresql-8.2-no-interfaces.patch 430 RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 SHA1 db70a0103d57bb2044f38fb0684328b80e365304 SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5
-MD5 486acb579010282ead6c424c6fb46ba1 files/postgresql-8.2-no-interfaces.patch 430
-RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 files/postgresql-8.2-no-interfaces.patch 430
-SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5 files/postgresql-8.2-no-interfaces.patch 430
-AUX postgresql-8.2-regress.patch 1516 RMD160 d50c3643795ef641d4630ad987bb1d49723d9eac SHA1 a6eca4cb7aac0f937b8d5299827d4e8a8406833d SHA256 291d6f98741a5016dfb86be8acedf7c6b3538e70fff55347005e5a9c49b7d6dd
-MD5 0afb28ed3c3cf6346f0009265a6271b2 files/postgresql-8.2-regress.patch 1516
-RMD160 d50c3643795ef641d4630ad987bb1d49723d9eac files/postgresql-8.2-regress.patch 1516
-SHA256 291d6f98741a5016dfb86be8acedf7c6b3538e70fff55347005e5a9c49b7d6dd files/postgresql-8.2-regress.patch 1516
-AUX postgresql-8.2-server.patch 2536 RMD160 af1858e18d1732818a16ed6c030f1e283c6eb4e5 SHA1 b428396d16f7140fc701ebed34ddf0bebc0249db SHA256 b7e9c4e993992b7677c38f2860de805547bc7b384089a4f75b3ece28298eb0a8
-MD5 76cea8ec5e54314453d44cda62217653 files/postgresql-8.2-server.patch 2536
-RMD160 af1858e18d1732818a16ed6c030f1e283c6eb4e5 files/postgresql-8.2-server.patch 2536
-SHA256 b7e9c4e993992b7677c38f2860de805547bc7b384089a4f75b3ece28298eb0a8 files/postgresql-8.2-server.patch 2536
+AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
+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.2-server.patch 4926 RMD160 362010d4ccf9efabdeeac1acc6a8d6c215d7a683 SHA1 0d2b93dda23f04d10976c9183f3d11be941748d0 SHA256 4c03ee3e8160a06e51c92dddd766d00a677d7d8e45a68ccdb0940612f5452de1
+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
@@ -130,11 +118,9 @@ DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c0560
 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-base-8.2.5.tar.bz2 8602348 RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 SHA1 437b5e0144485be16557cbb3d48102063e7df69d SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
+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.2.5.tar.bz2 167549 RMD160 92f6ee646eaf0268ee165fd592013cc3acaee5ca SHA1 bc1bf7528033bc17ae4e93ed071dd2b40bd19f94 SHA256 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5
 DIST postgresql-opt-8.3beta2.tar.bz2 178552 RMD160 33c74cec29ee085e68614712884ac9910a5d69e2 SHA1 d70db3f13d79e0d322a9c114cb1a8d8ed0f65aba SHA256 63443a5bbd57061f35d369e9f4feca71afed565243f17e1c3baa792759956725
-DIST postgresql-test-8.2.5.tar.bz2 987137 RMD160 0acc94206384bcd784bd2d35e9d5b9c256e24db0 SHA1 cd5da8abcee439ff4d613951293d48ea432274da SHA256 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752
 DIST postgresql-test-8.3beta2.tar.bz2 1069384 RMD160 8367c77ceb6116518b57e723aa1a060b9a4b5c5f SHA1 7b0a1d967903c8a93ca32c83f6221f5d76d5be76 SHA256 e13c175adb4ce625e361b4e19857f3c3c5de960bf6cf2a15c36fdcaaf2feaf15
 EBUILD postgresql-server-7.3.21.ebuild 8116 RMD160 5bad5b4f23d5d680a40a1941c7a2da61bc4fa90f SHA1 a0bbe7f4f8cb6537a8eec77a7b12614111f9662c SHA256 87db9e8bc1b910b972e0d6f450d3d6231ea1b126530d40c8d825ac7cf241c1fe
 MD5 824ab4e705584a5a8bef6e2d3cd70951 postgresql-server-7.3.21.ebuild 8116
@@ -152,10 +138,10 @@ EBUILD postgresql-server-8.1.11.ebuild 8240 RMD160 740d9d699ecd5b8c6d922eea7d877
 MD5 980883886841217083c70575cfe7ae94 postgresql-server-8.1.11.ebuild 8240
 RMD160 740d9d699ecd5b8c6d922eea7d877162c8bf1e51 postgresql-server-8.1.11.ebuild 8240
 SHA256 53613953bff7a71733cb24c03d2651ceba9bea4c11c5001822db848d2e0cc480 postgresql-server-8.1.11.ebuild 8240
-EBUILD postgresql-server-8.2.5.ebuild 8826 RMD160 9ec659216c1f3974b7f0041072bfe9c7612c2496 SHA1 5ef23a694ccb001f3d08663239ce4aed7c1d4ac5 SHA256 047b7d44fdeeb956861400ef4f183cbd2b6df12317dec7881ec343d7bf5ad114
-MD5 c50fcf50f08302da313c1f53f520e18a postgresql-server-8.2.5.ebuild 8826
-RMD160 9ec659216c1f3974b7f0041072bfe9c7612c2496 postgresql-server-8.2.5.ebuild 8826
-SHA256 047b7d44fdeeb956861400ef4f183cbd2b6df12317dec7881ec343d7bf5ad114 postgresql-server-8.2.5.ebuild 8826
+EBUILD postgresql-server-8.2.6.ebuild 8505 RMD160 5e62177c0dacc53c0da3d77bddca301068e72d98 SHA1 20b727fedf9467b6acf1093a53f7000cfbf6c7cb SHA256 b4eb992e22fd63fb63f1adea581c44359d24520523c96ce2aecdc4ecb22fd278
+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
@@ -176,9 +162,9 @@ SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/di
 MD5 8e0b9ba7ccb589a185904e1b7e564181 files/digest-postgresql-server-8.1.11 262
 RMD160 7f74888cad6f2898b7066b15796e33793986bfc7 files/digest-postgresql-server-8.1.11 262
 SHA256 0f8bbcf23f2f4a78191e2354d70d371e2fcdbf5bd931907c360b65270245d68e files/digest-postgresql-server-8.1.11 262
-MD5 b55326c0780778c9a0d91693facf727d files/digest-postgresql-server-8.2.5 804
-RMD160 861fdc75cd0e9ef81a6f68401c0e092fee27136b files/digest-postgresql-server-8.2.5 804
-SHA256 68ae14e762e44f46000fd71fcb490e2115ed16240cf3ec3f33d3e35b2fa4be37 files/digest-postgresql-server-8.2.5 804
+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
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.2.5 b/dev-db/postgresql-server/files/digest-postgresql-server-8.2.5
deleted file mode 100644
index 0a08b78..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.2.5
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5879b205b635f3fb905f6015c50f4edd postgresql-base-8.2.5.tar.bz2 8602348
-RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 postgresql-base-8.2.5.tar.bz2 8602348
-SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929 postgresql-base-8.2.5.tar.bz2 8602348
-MD5 dea12379311886d825fe7090884521b7 postgresql-opt-8.2.5.tar.bz2 167549
-RMD160 92f6ee646eaf0268ee165fd592013cc3acaee5ca postgresql-opt-8.2.5.tar.bz2 167549
-SHA256 0d64c3fd4fb097126d9cb7d599fbd86435f23d887f7985c9fdb441db4e3c9ae5 postgresql-opt-8.2.5.tar.bz2 167549
-MD5 a4d39451e13cef32df96df35e24643cb postgresql-test-8.2.5.tar.bz2 987137
-RMD160 0acc94206384bcd784bd2d35e9d5b9c256e24db0 postgresql-test-8.2.5.tar.bz2 987137
-SHA256 89174ef45e2ce09221d31c57745ecc18ea8f28389b0ba541ec2f26ba656dc752 postgresql-test-8.2.5.tar.bz2 987137
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.2.6 b/dev-db/postgresql-server/files/digest-postgresql-server-8.2.6
new file mode 100644
index 0000000..eb9626c
--- /dev/null
+++ b/dev-db/postgresql-server/files/digest-postgresql-server-8.2.6
@@ -0,0 +1,3 @@
+MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
+RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
+SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-common.patch b/dev-db/postgresql-server/files/postgresql-8.2-common.patch
new file mode 100644
index 0000000..e6e8e46
--- /dev/null
+++ b/dev-db/postgresql-server/files/postgresql-8.2-common.patch
@@ -0,0 +1,88 @@
+diff --git a/config/programs.m4 b/config/programs.m4
+index fb9793f..3510942 100644
+--- a/config/programs.m4
++++ b/config/programs.m4
+@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
+ dnl FIXME: We should probably check for version >=0.10.36.
+   AC_CHECK_PROGS(XGETTEXT, xgettext)
+ 
+-  # Note: share/locale is always the default, independent of $datadir
+-  localedir='${prefix}/share/locale'
++  # Note: share/locale *WAS* always the default, independent of $datadir
++  AC_ARG_WITH([locale-dir],
++   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
++   [ localedir="${withval}" ],
++   [ localedir='${prefix}/share/locale' ]
++  )
+   AC_SUBST(localedir)
+ ])# PGAC_CHECK_GETTEXT
+ 
+diff --git a/configure.in b/configure.in
+index 908a1ae..30dd3bb 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.2.6], [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-2006, 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 23f4cc9..707c303 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -298,6 +298,29 @@ tas(volatile slock_t *lock)
+ 
+ #endif	 /* __s390__ || __s390x__ */
+ 
++#if defined(__sh__)
++#define HAS_TEST_AND_SET
++
++typedef unsigned char slock_t;
++
++#define TAS(lock) tas(lock)
++
++static __inline__ int
++tas(volatile slock_t *lock)
++{
++	register int _res = 1;
++
++	__asm__ __volatile__(
++		"tas.b	@%1\n\t"
++		"movt	%0\n\t"
++		"xor	#1,%0"
++:		"=z"(_res)
++:		"r"(lock)
++:		"t","memory");
++	return _res;
++}
++
++#endif	 /* __sh__ */
+ 
+ #if defined(__sparc__)		/* Sparc */
+ #define HAS_TEST_AND_SET
+diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
+index 9f761d4..83b2974 100644
+--- a/src/makefiles/Makefile.darwin
++++ b/src/makefiles/Makefile.darwin
+@@ -5,7 +5,15 @@ DLSUFFIX = .so
+ CFLAGS_SL =
+ 
+ ifdef PGXS
++ifdef PGXS_IN_SERVER
++ifndef PGXS_WITH_SERVER
++BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
++else
++BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
++endif
++else
+ BE_DLLLIBS= -bundle_loader $(bindir)/postgres
++endif
+ else
+ BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
+ endif
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-darwin-build.patch b/dev-db/postgresql-server/files/postgresql-8.2-darwin-build.patch
deleted file mode 100644
index 5c9d509..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.2-darwin-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
-index 9f761d4..83b2974 100644
---- a/src/makefiles/Makefile.darwin
-+++ b/src/makefiles/Makefile.darwin
-@@ -5,7 +5,15 @@ DLSUFFIX = .so
- CFLAGS_SL =
- 
- ifdef PGXS
-+ifdef PGXS_IN_SERVER
-+ifndef PGXS_WITH_SERVER
-+BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
-+else
-+BE_DLLLIBS= -bundle_loader ${PGXS_WITH_SERVER}
-+endif
-+else
- BE_DLLLIBS= -bundle_loader $(bindir)/postgres
-+endif
- else
- BE_DLLLIBS= -bundle_loader $(top_builddir)/src/backend/postgres
- endif
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-nls.patch b/dev-db/postgresql-server/files/postgresql-8.2-nls.patch
deleted file mode 100644
index 983bc87..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.2-nls.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index fb9793f..3510942 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -162,8 +162,12 @@ AC_DEFUN([PGAC_CHECK_GETTEXT],
- dnl FIXME: We should probably check for version >=0.10.36.
-   AC_CHECK_PROGS(XGETTEXT, xgettext)
- 
--  # Note: share/locale is always the default, independent of $datadir
--  localedir='${prefix}/share/locale'
-+  # Note: share/locale *WAS* always the default, independent of $datadir
-+  AC_ARG_WITH([locale-dir],
-+   AC_HELP_STRING([--with-locale-dir],[Set path to locale files]),
-+   [ localedir="${withval}" ],
-+   [ localedir='${prefix}/share/locale' ]
-+  )
-   AC_SUBST(localedir)
- ])# PGAC_CHECK_GETTEXT
- 
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-no-interfaces.patch b/dev-db/postgresql-server/files/postgresql-8.2-no-interfaces.patch
deleted file mode 100644
index 897388e..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.2-no-interfaces.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index 820dfd5..2619acd 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -365,10 +365,10 @@ endif
- 
- 
- submake-libpq:
--	$(MAKE) -C $(libpq_builddir) all
-+	@true $(MAKE) -C $(libpq_builddir) all
- 
- submake-libpgport:
--	$(MAKE) -C $(top_builddir)/src/port all
-+	@true $(MAKE) -C $(top_builddir)/src/port all
- 
- .PHONY: submake-libpq submake-libpgport
- 
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-regress.patch b/dev-db/postgresql-server/files/postgresql-8.2-regress.patch
deleted file mode 100644
index e561eda..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.2-regress.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 @@ ##
- 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/"
- 
- installcheck: all
- 	-rm -rf ./testtablespace
-diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
-index 5daf28a..0d2a0a3 100644
---- a/src/test/regress/pg_regress.c
-+++ b/src/test/regress/pg_regress.c
-@@ -502,7 +502,7 @@ #endif
- 		datadir = tmp;
- 
- 		/* psql will be installed into temp-install bindir */
--		psqldir = bindir;
-+		/* psqldir = bindir; */
- 
- 		/*
- 		 * Set up shared library paths to include the temp install.
-@@ -1535,7 +1535,7 @@ #endif
- 		 */
- 		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.2-server.patch b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
index 7f56c14..0f39a63 100644
--- a/dev-db/postgresql-server/files/postgresql-8.2-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
@@ -2,7 +2,7 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in
 index 16f9057..0f6cee7 100644
 --- a/GNUmakefile.in
 +++ b/GNUmakefile.in
-@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.glo
+@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
  all:
  	$(MAKE) -C doc all
  	$(MAKE) -C src all
@@ -47,11 +47,22 @@ index 1787a1b..6b4104d 100644
  
  ifeq ($(with_openssl),yes)
  WANTED_DIRS += sslinfo
+diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
+index ba864c1..1e2e96e 100644
+--- a/contrib/adminpack/Makefile
++++ b/contrib/adminpack/Makefile
+@@ -1,5 +1,5 @@
+ 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
 diff --git a/src/Makefile b/src/Makefile
 index 6d9043a..ccf7ae7 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -18,14 +18,11 @@ all install installdirs uninstall dep de
+@@ -18,14 +18,11 @@ all install installdirs uninstall dep depend distprep:
  	$(MAKE) -C timezone $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -67,6 +78,23 @@ index 6d9043a..ccf7ae7 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 820dfd5..2619acd 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -365,10 +365,10 @@ endif
+ 
+ 
+ submake-libpq:
+-	$(MAKE) -C $(libpq_builddir) all
++	@true $(MAKE) -C $(libpq_builddir) all
+ 
+ submake-libpgport:
+-	$(MAKE) -C $(top_builddir)/src/port all
++	@true $(MAKE) -C $(top_builddir)/src/port all
+ 
+ .PHONY: submake-libpq submake-libpgport
+ 
 diff --git a/src/bin/Makefile b/src/bin/Makefile
 index 0d86213..2779a41 100644
 --- a/src/bin/Makefile
@@ -100,3 +128,39 @@ index 1742eb8..21fd79f 100644
  
  installdirs:
  	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
+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:
+ 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/"
+ 
+ installcheck: all
+ 	-rm -rf ./testtablespace
+diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
+index 5daf28a..0d2a0a3 100644
+--- a/src/test/regress/pg_regress.c
++++ b/src/test/regress/pg_regress.c
+@@ -502,7 +502,7 @@ initialize_environment(void)
+ 		datadir = tmp;
+ 
+ 		/* psql will be installed into temp-install bindir */
+-		psqldir = bindir;
++		/* psqldir = bindir; */
+ 
+ 		/*
+ 		 * Set up shared library paths to include the temp install.
+@@ -1535,7 +1535,7 @@ main(int argc, char *argv[])
+ 		 */
+ 		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.2.5.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.6.ebuild
index 8ff7e25..9330494 100644
--- a/dev-db/postgresql-server/postgresql-server-8.2.5.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.2.6.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}/postgresql-${PV}.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_/'
@@ -65,20 +63,16 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/postgresql-${SLOT}-nls.patch"
+	epatch "${FILESDIR}/postgresql-${SLOT}-common.patch"
 	epatch "${FILESDIR}/postgresql-${SLOT}-server.patch"
-	epatch "${FILESDIR}/postgresql-${SLOT}-no-interfaces.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
 
-	epatch "${FILESDIR}/postgresql-${SLOT}-darwin-build.patch"
-
 	eautoconf
 }
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 21f86e7..42f310b 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -14,10 +14,10 @@ EBUILD postgresql-8.1.11.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54
 MD5 20abcea6f4619fcd39aa399905b4146d postgresql-8.1.11.ebuild 1012
 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-8.1.11.ebuild 1012
 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6 postgresql-8.1.11.ebuild 1012
-EBUILD postgresql-8.2.5.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f SHA1 a74f359d746918f45eb28784abb595d7f3bcb7d3 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6
-MD5 20abcea6f4619fcd39aa399905b4146d postgresql-8.2.5.ebuild 1012
-RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-8.2.5.ebuild 1012
-SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6 postgresql-8.2.5.ebuild 1012
+EBUILD postgresql-8.2.6.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f SHA1 a74f359d746918f45eb28784abb595d7f3bcb7d3 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6
+MD5 20abcea6f4619fcd39aa399905b4146d postgresql-8.2.6.ebuild 1012
+RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-8.2.6.ebuild 1012
+SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6 postgresql-8.2.6.ebuild 1012
 MISC ChangeLog 852 RMD160 62baa723bd20c4e8e28a84b9a8cc6bbae235cb96 SHA1 59bd0ee3d5104eaf176b8f65c20b83f77833a74c SHA256 0ea0b064f69830ad36afa7939e84b5eaab01f24d492c83eb27a8b2ef4480f5d2
 MD5 71d24c496418c8e91a946d4122f58221 ChangeLog 852
 RMD160 62baa723bd20c4e8e28a84b9a8cc6bbae235cb96 ChangeLog 852
@@ -38,6 +38,6 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-8.1.11 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-8.1.11 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-8.1.11 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-8.2.5 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-8.2.5 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-8.2.5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-8.2.6 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-8.2.6 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-8.2.6 0
diff --git a/dev-db/postgresql/files/digest-postgresql-8.2.5 b/dev-db/postgresql/files/digest-postgresql-8.2.6
index e69de29..e69de29 100644
--- a/dev-db/postgresql/files/digest-postgresql-8.2.5
+++ b/dev-db/postgresql/files/digest-postgresql-8.2.6
diff --git a/dev-db/postgresql/postgresql-8.2.5.ebuild b/dev-db/postgresql/postgresql-8.2.6.ebuild
index 4a526fd..4a526fd 100644
--- a/dev-db/postgresql/postgresql-8.2.5.ebuild
+++ b/dev-db/postgresql/postgresql-8.2.6.ebuild