dev-db/postgresql*: bump 8.0* to 8.0.15

svn path=/experimental/; revision=303

32 files changed, 437 insertions, 360 deletions

diff --git a/dev-db/postgresql-client/Manifest b/dev-db/postgresql-client/Manifest
index 4bdd85a..aef7f8b 100644
--- a/dev-db/postgresql-client/Manifest
+++ b/dev-db/postgresql-client/Manifest
@@ -30,18 +30,14 @@ AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da
 MD5 e70130009db4999da7c71240e01bab56 files/postgresql-7.4.19-autoconf.patch 1870
 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 files/postgresql-7.4.19-autoconf.patch 1870
 SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e files/postgresql-7.4.19-autoconf.patch 1870
-AUX postgresql-8.0-client.patch 2822 RMD160 1b2b5ada1a3bb314dba57016016661298a137d6c SHA1 3076bda9547f2e2b162af37954bb4e339dec5849 SHA256 d5a4696b86f1b7486dc50a5d371d2cb6e542f4a3e5b6b639e0fb4a8ca749afbe
-MD5 dce4b2df4ec40940ff5061b2c09dba42 files/postgresql-8.0-client.patch 2822
-RMD160 1b2b5ada1a3bb314dba57016016661298a137d6c files/postgresql-8.0-client.patch 2822
-SHA256 d5a4696b86f1b7486dc50a5d371d2cb6e542f4a3e5b6b639e0fb4a8ca749afbe files/postgresql-8.0-client.patch 2822
-AUX postgresql-8.0-nls.patch 903 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af SHA1 f49df137be68a34b7f30e0c054df9f0e39721c22 SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98
-MD5 adfce07a45d624bc1903905090ffe431 files/postgresql-8.0-nls.patch 903
-RMD160 ffbe83748941a0d25715f6cfbadda95441d152af files/postgresql-8.0-nls.patch 903
-SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98 files/postgresql-8.0-nls.patch 903
-AUX postgresql-8.0-no-interfaces.patch 430 RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 SHA1 db70a0103d57bb2044f38fb0684328b80e365304 SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5
-MD5 486acb579010282ead6c424c6fb46ba1 files/postgresql-8.0-no-interfaces.patch 430
-RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 files/postgresql-8.0-no-interfaces.patch 430
-SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5 files/postgresql-8.0-no-interfaces.patch 430
+AUX postgresql-8.0-client.patch 3258 RMD160 e7a637416cd2ddbbffb5e497058266e9154cffb0 SHA1 76567219620f8fca34b6f3430ae21ea538aa6100 SHA256 9425b11b6105454fda3ce8ffec73db5b6291206914255a350729f4e8c10f021a
+MD5 089d57e9df6d6bdc9d813d430d6753c4 files/postgresql-8.0-client.patch 3258
+RMD160 e7a637416cd2ddbbffb5e497058266e9154cffb0 files/postgresql-8.0-client.patch 3258
+SHA256 9425b11b6105454fda3ce8ffec73db5b6291206914255a350729f4e8c10f021a files/postgresql-8.0-client.patch 3258
+AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
+MD5 bac29f949dff50568abc3b298d2402d6 files/postgresql-8.0-common.patch 2294
+RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 files/postgresql-8.0-common.patch 2294
+SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681 files/postgresql-8.0-common.patch 2294
 AUX postgresql-8.1-client.patch 2276 RMD160 7cc4374061a8c22e4157dc8b62b8dcc7e2ac5a45 SHA1 36addea2e58065afa2a3fb0fcc8afd8d2259f0a7 SHA256 f78bcf6be04f243c728c40ae03d529f08185daa928c545b074bf7d2f4ec630f2
 MD5 f97e800c74b9aa33f648b7eebbceb94c files/postgresql-8.1-client.patch 2276
 RMD160 7cc4374061a8c22e4157dc8b62b8dcc7e2ac5a45 files/postgresql-8.1-client.patch 2276
@@ -76,11 +72,10 @@ RMD160 938a4df3e592fb95683ed35efa3ba91d72424ef0 files/postgresql-8.3-common.patc
 SHA256 30aa24dd4016ae51f8003928cc96fc00c7abc36302195b2e2e454b4dda4b06bb files/postgresql-8.3-common.patch 1930
 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-base-8.0.14.tar.bz2 7907547 RMD160 4e1c627af447ef24ec343baa3121edd2427d9fa9 SHA1 55880d8e398faffb4a88e808a3dca2cef77b1b79 SHA256 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e
+DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 DIST postgresql-base-8.1.10.tar.bz2 8110015 RMD160 473e1c66ccc9d4ec47b01b03dff7951749afc785 SHA1 6d4c53d9946386d44f6ee33a9f76d92e00fc1f9c SHA256 c49b8b094838024ef09d1e574181c409dbc3bb13c8470ae495e74a0185aed981
 DIST postgresql-base-8.2.5.tar.bz2 8602348 RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 SHA1 437b5e0144485be16557cbb3d48102063e7df69d SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
 DIST postgresql-base-8.3beta2.tar.bz2 9587997 RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 SHA1 cab5a2d93fe87783800683d22719717152dddc17 SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
-DIST postgresql-opt-8.0.14.tar.bz2 134706 RMD160 ff8773b373aa33f6c43f2d7cc3a56b4484197fc7 SHA1 359127fba3130e46309b24f019eea0fb278ea033 SHA256 b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a
 DIST postgresql-opt-8.1.10.tar.bz2 144584 RMD160 fd9f11216465513494320b43fe27614c01b98e98 SHA1 d316b1a3b2a8f766ecf871537cf5d8067232a978 SHA256 9c99a8c31515107e29201e2ba1c5362871851b54bcf6bb9a5d3f81848196834f
 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
@@ -92,10 +87,10 @@ EBUILD postgresql-client-7.4.19.ebuild 3088 RMD160 5e37bfbc388e70878b42676278897
 MD5 dc90ad8d729a1c714c05e9c49c1f8334 postgresql-client-7.4.19.ebuild 3088
 RMD160 5e37bfbc388e70878b4267627889702169a325be postgresql-client-7.4.19.ebuild 3088
 SHA256 4cd24c6b47d37cdcab933a53be3c789683e2de2bb327c0cefd0b1452503d33b6 postgresql-client-7.4.19.ebuild 3088
-EBUILD postgresql-client-8.0.14.ebuild 3528 RMD160 3edcf1faebdc09e6a1518ba5abbffcf126b1907d SHA1 5b5b3be488d7709f4f0f6d2be2429a2481915332 SHA256 7e5fc942f5421a7c2cbdaef3d2bf3dce0a4c357cc2a5fdc0d671f4c57b9692d6
-MD5 0284471aaccaa620d928504b8c249846 postgresql-client-8.0.14.ebuild 3528
-RMD160 3edcf1faebdc09e6a1518ba5abbffcf126b1907d postgresql-client-8.0.14.ebuild 3528
-SHA256 7e5fc942f5421a7c2cbdaef3d2bf3dce0a4c357cc2a5fdc0d671f4c57b9692d6 postgresql-client-8.0.14.ebuild 3528
+EBUILD postgresql-client-8.0.15.ebuild 3401 RMD160 b0bacdc1d7babd853b755173e9831092b2a85c3a SHA1 fa0a6a89c7fe799e10c48130ced3e34b6cadbfa8 SHA256 fdb376d334fe6a931c08ee773b9b1075557ea301f7c17ac428f7b0b2e175ad93
+MD5 58dc5650204a1e91715a8c6899642d37 postgresql-client-8.0.15.ebuild 3401
+RMD160 b0bacdc1d7babd853b755173e9831092b2a85c3a postgresql-client-8.0.15.ebuild 3401
+SHA256 fdb376d334fe6a931c08ee773b9b1075557ea301f7c17ac428f7b0b2e175ad93 postgresql-client-8.0.15.ebuild 3401
 EBUILD postgresql-client-8.1.10.ebuild 3255 RMD160 e04b4a70d253270e42539fe327c30776e04ec6c3 SHA1 a5aef431d30169639e568e9b978f0db8ed150402 SHA256 2e00ac7f4384b2aea07db90f988c52f9592561703ebb5daf9709257e49d434bd
 MD5 e5a244bead4cbfd72bffa3355e644144 postgresql-client-8.1.10.ebuild 3255
 RMD160 e04b4a70d253270e42539fe327c30776e04ec6c3 postgresql-client-8.1.10.ebuild 3255
@@ -118,9 +113,9 @@ SHA256 4a09b60d4700c7feb998b1d07118eab0b930bee7a325ab3a138246c2c7e86ec6 files/di
 MD5 d98b405b951efbaa919ed890118f3262 files/digest-postgresql-client-7.4.19 262
 RMD160 fa3e756851fbf3b72ea22b402837260263e6371c files/digest-postgresql-client-7.4.19 262
 SHA256 e68f25453b492b1b956e0fe7a6511d375befb38d43a3a456f52db0af80b6c18a files/digest-postgresql-client-7.4.19 262
-MD5 c4723ad488e18e7fb3aebce05883faeb files/digest-postgresql-client-8.0.14 542
-RMD160 044c631dfd059aa47a89a8db418f5d0e4fc7e3ac files/digest-postgresql-client-8.0.14 542
-SHA256 1754565f078fc583cf07be877ceffcf8a092491a050c9c25620bd889d582a7b4 files/digest-postgresql-client-8.0.14 542
+MD5 e0438519efec2797b6430212965d56eb files/digest-postgresql-client-8.0.15 262
+RMD160 1ad7b4f3a03631b3b6dbcf2fcf75bd8b3facb344 files/digest-postgresql-client-8.0.15 262
+SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/digest-postgresql-client-8.0.15 262
 MD5 b608e2d2cc1f3e2b4db7ef850b662a25 files/digest-postgresql-client-8.1.10 542
 RMD160 99094653a569c235da486daadad8b1dab7b8a292 files/digest-postgresql-client-8.1.10 542
 SHA256 6d1ad8779eff0cb78d7bd239a45eccf3777acabedf3eddb0301b26cfc07a44b5 files/digest-postgresql-client-8.1.10 542
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.0.14 b/dev-db/postgresql-client/files/digest-postgresql-client-8.0.14
deleted file mode 100644
index ce9aab5..0000000
--- a/dev-db/postgresql-client/files/digest-postgresql-client-8.0.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ffaaa630db6613cedbe935edd85d2a98 postgresql-base-8.0.14.tar.bz2 7907547
-RMD160 4e1c627af447ef24ec343baa3121edd2427d9fa9 postgresql-base-8.0.14.tar.bz2 7907547
-SHA256 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e postgresql-base-8.0.14.tar.bz2 7907547
-MD5 6a6feb48ca70bf1e36e99bab1671b66d postgresql-opt-8.0.14.tar.bz2 134706
-RMD160 ff8773b373aa33f6c43f2d7cc3a56b4484197fc7 postgresql-opt-8.0.14.tar.bz2 134706
-SHA256 b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a postgresql-opt-8.0.14.tar.bz2 134706
diff --git a/dev-db/postgresql-client/files/digest-postgresql-client-8.0.15 b/dev-db/postgresql-client/files/digest-postgresql-client-8.0.15
new file mode 100644
index 0000000..e7881b8
--- /dev/null
+++ b/dev-db/postgresql-client/files/digest-postgresql-client-8.0.15
@@ -0,0 +1,3 @@
+MD5 3ee548b3643e0a0a4b76493e81b336f3 postgresql-8.0.15.tar.bz2 11253897
+RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 postgresql-8.0.15.tar.bz2 11253897
+SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 postgresql-8.0.15.tar.bz2 11253897
diff --git a/dev-db/postgresql-client/files/postgresql-8.0-client.patch b/dev-db/postgresql-client/files/postgresql-8.0-client.patch
index 2384aa6..7438cf0 100644
--- a/dev-db/postgresql-client/files/postgresql-8.0-client.patch
+++ b/dev-db/postgresql-client/files/postgresql-8.0-client.patch
@@ -2,7 +2,7 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in
 index c451bd6..a048ce7 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
@@ -72,7 +72,7 @@ diff --git a/contrib/pg_autovacuum/Makefile b/contrib/pg_autovacuum/Makefile
 index c512d18..e822063 100644
 --- a/contrib/pg_autovacuum/Makefile
 +++ b/contrib/pg_autovacuum/Makefile
-@@ -18,5 +18,5 @@ include $(top_builddir)/src/Makefile.glo
+@@ -18,5 +18,5 @@ include $(top_builddir)/src/Makefile.global
  include $(top_srcdir)/contrib/contrib-global.mk
  endif
  
@@ -103,6 +103,23 @@ index 0963f88..155323c 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 e57265e..e081618 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -336,10 +336,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 8309db1..7c1c47f 100644
 --- a/src/bin/Makefile
diff --git a/dev-db/postgresql-client/files/postgresql-8.0-common.patch b/dev-db/postgresql-client/files/postgresql-8.0-common.patch
new file mode 100644
index 0000000..40932ec
--- /dev/null
+++ b/dev-db/postgresql-client/files/postgresql-8.0-common.patch
@@ -0,0 +1,76 @@
+diff --git a/config/programs.m4 b/config/programs.m4
+index 3f87396..9c7fbf0 100644
+--- a/config/programs.m4
++++ b/config/programs.m4
+@@ -153,13 +153,13 @@ 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'
+-  if test x"$prefix" = x"NONE"; then
+-    exp_localedir="$ac_default_prefix/share/locale"
+-  else
+-    exp_localedir="$prefix/share/locale"
+-  fi
++  # 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' ]
++  )
++  exp_localedir="${localedir}"
+ 
+   AC_SUBST(localedir)
+   AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index c71b175..674036a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [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-2005, 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 0c2dff0..d548d4d 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -239,6 +239,31 @@ 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__)
+ #define HAS_TEST_AND_SET
+ 
diff --git a/dev-db/postgresql-client/files/postgresql-8.0-nls.patch b/dev-db/postgresql-client/files/postgresql-8.0-nls.patch
deleted file mode 100644
index dabc966..0000000
--- a/dev-db/postgresql-client/files/postgresql-8.0-nls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index 3f87396..9c7fbf0 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -153,13 +153,13 @@ 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'
--  if test x"$prefix" = x"NONE"; then
--    exp_localedir="$ac_default_prefix/share/locale"
--  else
--    exp_localedir="$prefix/share/locale"
--  fi
-+  # 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' ]
-+  )
-+  exp_localedir="${localedir}"
- 
-   AC_SUBST(localedir)
-   AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
diff --git a/dev-db/postgresql-client/files/postgresql-8.0-no-interfaces.patch b/dev-db/postgresql-client/files/postgresql-8.0-no-interfaces.patch
deleted file mode 100644
index 897388e..0000000
--- a/dev-db/postgresql-client/files/postgresql-8.0-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.0.14.ebuild b/dev-db/postgresql-client/postgresql-client-8.0.15.ebuild
index fad183d..d4bb88a 100644
--- a/dev-db/postgresql-client/postgresql-client-8.0.14.ebuild
+++ b/dev-db/postgresql-client/postgresql-client-8.0.15.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 856f934..95e4e21 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -1,6 +1,6 @@
 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-docs-8.0.14.tar.bz2 2274002 RMD160 fc62e74b90c6b8b241aa3f825db418170c0e5e48 SHA1 54540eb3083bdf20bf680a26890829df40e9c821 SHA256 df1da39c1bbdb54f506a25332770ccf19296234ba0b9ac755e8b1c5bdf296f10
+DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 DIST postgresql-docs-8.1.10.tar.bz2 2507870 RMD160 99651337e7e6addbc4f5298874df369917b6994e SHA1 e9924dcbc3a7a65826edfddbd671edcee79b6aad SHA256 870edb5e0d364d235f9f83820256db66eaf1aebfd47e05b7a4546bff53bfac88
 DIST postgresql-docs-8.2.5.tar.bz2 2773777 RMD160 56cdea05e6b162f21b021df807f6051102d14b75 SHA1 14f8051f8a548615357a2b89223cdb15d1817e9f SHA256 8824f13eaca20328ffa1244ba036c51890a718f40683b9e3003e72b77a1f774d
 DIST postgresql-docs-8.3beta2.tar.bz2 2990921 RMD160 70d45c84e18ea335b8df48cb09cfb98e5758878e SHA1 68b189a6f1d9ddf133650a51e04d8dbd7fec83c9 SHA256 22922af88ad591df98434a183191bc4a8692f1a741fed51db3090cc6ba67aaf8
@@ -12,10 +12,10 @@ EBUILD postgresql-docs-7.4.19.ebuild 1001 RMD160 05ad8bcc2c5a42ebe2145e80456af8e
 MD5 a632c1d2ac6914ccacd4e4c1a9d1dd00 postgresql-docs-7.4.19.ebuild 1001
 RMD160 05ad8bcc2c5a42ebe2145e80456af8e866b71081 postgresql-docs-7.4.19.ebuild 1001
 SHA256 ad030ede527b1de68db40be539ed85f5f3dbb79b71e6d0c40cdec785567777fa postgresql-docs-7.4.19.ebuild 1001
-EBUILD postgresql-docs-8.0.14.ebuild 984 RMD160 d68961341171537373b0106f15ae5cd284cf0db7 SHA1 d62fbad009d7f59c8d054c9f31bad81f2d7f75c8 SHA256 064ee0f6ea1b3ac997486941a54fb68c7672ecf3896f436f7abf3bbbe40b6179
-MD5 356b4ec292b3aada0faaa407050ce2c6 postgresql-docs-8.0.14.ebuild 984
-RMD160 d68961341171537373b0106f15ae5cd284cf0db7 postgresql-docs-8.0.14.ebuild 984
-SHA256 064ee0f6ea1b3ac997486941a54fb68c7672ecf3896f436f7abf3bbbe40b6179 postgresql-docs-8.0.14.ebuild 984
+EBUILD postgresql-docs-8.0.15.ebuild 979 RMD160 98f199b1820190894601cf777638c07576462a07 SHA1 c860956dfe6ea5c3acc2901f4c0c5844b2eb67ab SHA256 de46f52fbcaa88971bf6063bec458557329cfd766c6b173669ab12037dc393db
+MD5 adb7c8bc12d0a1c82e0d92c793da9d40 postgresql-docs-8.0.15.ebuild 979
+RMD160 98f199b1820190894601cf777638c07576462a07 postgresql-docs-8.0.15.ebuild 979
+SHA256 de46f52fbcaa88971bf6063bec458557329cfd766c6b173669ab12037dc393db postgresql-docs-8.0.15.ebuild 979
 EBUILD postgresql-docs-8.1.10.ebuild 984 RMD160 d68961341171537373b0106f15ae5cd284cf0db7 SHA1 d62fbad009d7f59c8d054c9f31bad81f2d7f75c8 SHA256 064ee0f6ea1b3ac997486941a54fb68c7672ecf3896f436f7abf3bbbe40b6179
 MD5 356b4ec292b3aada0faaa407050ce2c6 postgresql-docs-8.1.10.ebuild 984
 RMD160 d68961341171537373b0106f15ae5cd284cf0db7 postgresql-docs-8.1.10.ebuild 984
@@ -34,9 +34,9 @@ SHA256 4a09b60d4700c7feb998b1d07118eab0b930bee7a325ab3a138246c2c7e86ec6 files/di
 MD5 d98b405b951efbaa919ed890118f3262 files/digest-postgresql-docs-7.4.19 262
 RMD160 fa3e756851fbf3b72ea22b402837260263e6371c files/digest-postgresql-docs-7.4.19 262
 SHA256 e68f25453b492b1b956e0fe7a6511d375befb38d43a3a456f52db0af80b6c18a files/digest-postgresql-docs-7.4.19 262
-MD5 6cdbd9f7cf5d8dd99f3072698dd83f6f files/digest-postgresql-docs-8.0.14 274
-RMD160 0ae17adac8367e6b4382e2bcf9723215039753ec files/digest-postgresql-docs-8.0.14 274
-SHA256 bc70f3b125bfad8700ade1072683de7d4237bee5feff994f55364609e41b9ff8 files/digest-postgresql-docs-8.0.14 274
+MD5 e0438519efec2797b6430212965d56eb files/digest-postgresql-docs-8.0.15 262
+RMD160 1ad7b4f3a03631b3b6dbcf2fcf75bd8b3facb344 files/digest-postgresql-docs-8.0.15 262
+SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/digest-postgresql-docs-8.0.15 262
 MD5 f930e7dc984958aeca948a52bf2cbc10 files/digest-postgresql-docs-8.1.10 274
 RMD160 2d5e5d2b6a81a1d99b24a70cd181431e544f82d3 files/digest-postgresql-docs-8.1.10 274
 SHA256 a86baba95f52eacb7e2f82813582c7b2412c25345cc7c2f37c391663b49b6a49 files/digest-postgresql-docs-8.1.10 274
diff --git a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.0.14 b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.0.14
deleted file mode 100644
index 59a8f19..0000000
--- a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2435d1036364eecf093bc783d4e92101 postgresql-docs-8.0.14.tar.bz2 2274002
-RMD160 fc62e74b90c6b8b241aa3f825db418170c0e5e48 postgresql-docs-8.0.14.tar.bz2 2274002
-SHA256 df1da39c1bbdb54f506a25332770ccf19296234ba0b9ac755e8b1c5bdf296f10 postgresql-docs-8.0.14.tar.bz2 2274002
diff --git a/dev-db/postgresql-docs/files/digest-postgresql-docs-8.0.15 b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.0.15
new file mode 100644
index 0000000..e7881b8
--- /dev/null
+++ b/dev-db/postgresql-docs/files/digest-postgresql-docs-8.0.15
@@ -0,0 +1,3 @@
+MD5 3ee548b3643e0a0a4b76493e81b336f3 postgresql-8.0.15.tar.bz2 11253897
+RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 postgresql-8.0.15.tar.bz2 11253897
+SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 postgresql-8.0.15.tar.bz2 11253897
diff --git a/dev-db/postgresql-docs/postgresql-docs-8.0.14.ebuild b/dev-db/postgresql-docs/postgresql-docs-8.0.15.ebuild
index 6cbd7fa..6b56123 100644
--- a/dev-db/postgresql-docs/postgresql-docs-8.0.14.ebuild
+++ b/dev-db/postgresql-docs/postgresql-docs-8.0.15.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=""
diff --git a/dev-db/postgresql-libs/Manifest b/dev-db/postgresql-libs/Manifest
index 2aa1544..a5cfa6b 100644
--- a/dev-db/postgresql-libs/Manifest
+++ b/dev-db/postgresql-libs/Manifest
@@ -18,18 +18,14 @@ AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da
 MD5 e70130009db4999da7c71240e01bab56 files/postgresql-7.4.19-autoconf.patch 1870
 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 files/postgresql-7.4.19-autoconf.patch 1870
 SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e files/postgresql-7.4.19-autoconf.patch 1870
-AUX postgresql-8.0-libs.patch 3348 RMD160 2d8e6cd59e1174fb836696716071f93376fcb97e SHA1 895c36387acf091259ea64a2ac87b6489a322d62 SHA256 39140f92033e79a06852ce1fda7de7ccb1a33e80381d85c4d8bdab5101b6a3b3
-MD5 6f7ca0db4664977908d54717440290da files/postgresql-8.0-libs.patch 3348
-RMD160 2d8e6cd59e1174fb836696716071f93376fcb97e files/postgresql-8.0-libs.patch 3348
-SHA256 39140f92033e79a06852ce1fda7de7ccb1a33e80381d85c4d8bdab5101b6a3b3 files/postgresql-8.0-libs.patch 3348
-AUX postgresql-8.0-nls.patch 903 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af SHA1 f49df137be68a34b7f30e0c054df9f0e39721c22 SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98
-MD5 adfce07a45d624bc1903905090ffe431 files/postgresql-8.0-nls.patch 903
-RMD160 ffbe83748941a0d25715f6cfbadda95441d152af files/postgresql-8.0-nls.patch 903
-SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98 files/postgresql-8.0-nls.patch 903
-AUX postgresql-8.0-sh-spinlocks.patch 680 RMD160 5849a93312dc60880bd5e07a4e3b48e2db431de1 SHA1 b13e644e6bb64c1e802c7ce9cbc9fc966ddcc924 SHA256 2a6f2e618433d09999bc6ed691f5c03d996560d564045eea3de644e612b46e5c
-MD5 433afe40aeae6616d6dddc3373e6728a files/postgresql-8.0-sh-spinlocks.patch 680
-RMD160 5849a93312dc60880bd5e07a4e3b48e2db431de1 files/postgresql-8.0-sh-spinlocks.patch 680
-SHA256 2a6f2e618433d09999bc6ed691f5c03d996560d564045eea3de644e612b46e5c files/postgresql-8.0-sh-spinlocks.patch 680
+AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
+MD5 bac29f949dff50568abc3b298d2402d6 files/postgresql-8.0-common.patch 2294
+RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 files/postgresql-8.0-common.patch 2294
+SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681 files/postgresql-8.0-common.patch 2294
+AUX postgresql-8.0-libs.patch 3362 RMD160 5b68981c490aff2a0739b70e204f54e249208e36 SHA1 d8fe8bb990623b283ae7014ed1a92a362b55edbe SHA256 468edf9f8e218083ce0b976a2900cd8930efebddbe59632f1f43ecdaa2dabc88
+MD5 69190f1b2e105ffc4605894b9794c46d files/postgresql-8.0-libs.patch 3362
+RMD160 5b68981c490aff2a0739b70e204f54e249208e36 files/postgresql-8.0-libs.patch 3362
+SHA256 468edf9f8e218083ce0b976a2900cd8930efebddbe59632f1f43ecdaa2dabc88 files/postgresql-8.0-libs.patch 3362
 AUX postgresql-8.1-libs.patch 3348 RMD160 d821e45e417372fdf78b9b8bf157a2a60f5022ba SHA1 c6060ea8d1e5187abc090d5ee3f491f82779a288 SHA256 7891c4ea48cec55dd2ffcc7f4fb01aad2a3139a85ac15ca74d55016c0f8daead
 MD5 435276923eed1894fdd28967cac8f43b files/postgresql-8.1-libs.patch 3348
 RMD160 d821e45e417372fdf78b9b8bf157a2a60f5022ba files/postgresql-8.1-libs.patch 3348
@@ -68,11 +64,10 @@ RMD160 125ddb8a98f44493513b90301dbfd982213bd7f4 files/postgresql-8.3-libs.patch
 SHA256 0363fc5ab8289ddca2e944ef00d7773a2add231675e6eabaaaa56591423be8f5 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-base-8.0.14.tar.bz2 7907547 RMD160 4e1c627af447ef24ec343baa3121edd2427d9fa9 SHA1 55880d8e398faffb4a88e808a3dca2cef77b1b79 SHA256 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e
+DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 DIST postgresql-base-8.1.10.tar.bz2 8110015 RMD160 473e1c66ccc9d4ec47b01b03dff7951749afc785 SHA1 6d4c53d9946386d44f6ee33a9f76d92e00fc1f9c SHA256 c49b8b094838024ef09d1e574181c409dbc3bb13c8470ae495e74a0185aed981
 DIST postgresql-base-8.2.5.tar.bz2 8602348 RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 SHA1 437b5e0144485be16557cbb3d48102063e7df69d SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
 DIST postgresql-base-8.3beta2.tar.bz2 9587997 RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 SHA1 cab5a2d93fe87783800683d22719717152dddc17 SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
-DIST postgresql-opt-8.0.14.tar.bz2 134706 RMD160 ff8773b373aa33f6c43f2d7cc3a56b4484197fc7 SHA1 359127fba3130e46309b24f019eea0fb278ea033 SHA256 b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a
 DIST postgresql-opt-8.1.10.tar.bz2 144584 RMD160 fd9f11216465513494320b43fe27614c01b98e98 SHA1 d316b1a3b2a8f766ecf871537cf5d8067232a978 SHA256 9c99a8c31515107e29201e2ba1c5362871851b54bcf6bb9a5d3f81848196834f
 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
@@ -84,10 +79,10 @@ EBUILD postgresql-libs-7.4.19.ebuild 4066 RMD160 6fb448cb8eee622aecc65509a38a125
 MD5 c579241162e3538616cdb98d6897330c postgresql-libs-7.4.19.ebuild 4066
 RMD160 6fb448cb8eee622aecc65509a38a125ee9062b73 postgresql-libs-7.4.19.ebuild 4066
 SHA256 7715be7a26287d1682bcb630627a95af18d4a8bca4cba09dc57f67086d3918d3 postgresql-libs-7.4.19.ebuild 4066
-EBUILD postgresql-libs-8.0.14.ebuild 4177 RMD160 14cbe4b343eb343b8cea060e4b6cdd8d26169154 SHA1 7e489aaca9cad0361c6aaa232cf7e72187a78b3d SHA256 c542c2417f792a1d8ca70dac8f4800fa4d380df461b350f7e5bf3a9377d718df
-MD5 49ede0f8720f937e9fab5432ab02bab3 postgresql-libs-8.0.14.ebuild 4177
-RMD160 14cbe4b343eb343b8cea060e4b6cdd8d26169154 postgresql-libs-8.0.14.ebuild 4177
-SHA256 c542c2417f792a1d8ca70dac8f4800fa4d380df461b350f7e5bf3a9377d718df postgresql-libs-8.0.14.ebuild 4177
+EBUILD postgresql-libs-8.0.15.ebuild 4037 RMD160 ded279d505e28a540f129f067145a4639e0b1b33 SHA1 a180e6531c09cb5d4e3e16b1f312c19b05df0dfc SHA256 6c5cb04211f68c291e567c15234c8dcadeba11df0da0b324fabe04eacb18b164
+MD5 e55f86399698424d82f68bdb4d908edb postgresql-libs-8.0.15.ebuild 4037
+RMD160 ded279d505e28a540f129f067145a4639e0b1b33 postgresql-libs-8.0.15.ebuild 4037
+SHA256 6c5cb04211f68c291e567c15234c8dcadeba11df0da0b324fabe04eacb18b164 postgresql-libs-8.0.15.ebuild 4037
 EBUILD postgresql-libs-8.1.10.ebuild 4176 RMD160 4ed8fbf8b259e93b0379c606b25cce3647638a85 SHA1 27c6d5f94da2a5dea36cc0b5d22ddbdda2a37503 SHA256 25a0035ce60efe1ad6e00bbf7d32261735ad555b8e5c158aab68882724e5e2b3
 MD5 84812f63e82b8125f566ebee63ce70d9 postgresql-libs-8.1.10.ebuild 4176
 RMD160 4ed8fbf8b259e93b0379c606b25cce3647638a85 postgresql-libs-8.1.10.ebuild 4176
@@ -114,9 +109,9 @@ SHA256 4a09b60d4700c7feb998b1d07118eab0b930bee7a325ab3a138246c2c7e86ec6 files/di
 MD5 d98b405b951efbaa919ed890118f3262 files/digest-postgresql-libs-7.4.19 262
 RMD160 fa3e756851fbf3b72ea22b402837260263e6371c files/digest-postgresql-libs-7.4.19 262
 SHA256 e68f25453b492b1b956e0fe7a6511d375befb38d43a3a456f52db0af80b6c18a files/digest-postgresql-libs-7.4.19 262
-MD5 c4723ad488e18e7fb3aebce05883faeb files/digest-postgresql-libs-8.0.14 542
-RMD160 044c631dfd059aa47a89a8db418f5d0e4fc7e3ac files/digest-postgresql-libs-8.0.14 542
-SHA256 1754565f078fc583cf07be877ceffcf8a092491a050c9c25620bd889d582a7b4 files/digest-postgresql-libs-8.0.14 542
+MD5 e0438519efec2797b6430212965d56eb files/digest-postgresql-libs-8.0.15 262
+RMD160 1ad7b4f3a03631b3b6dbcf2fcf75bd8b3facb344 files/digest-postgresql-libs-8.0.15 262
+SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/digest-postgresql-libs-8.0.15 262
 MD5 b608e2d2cc1f3e2b4db7ef850b662a25 files/digest-postgresql-libs-8.1.10 542
 RMD160 99094653a569c235da486daadad8b1dab7b8a292 files/digest-postgresql-libs-8.1.10 542
 SHA256 6d1ad8779eff0cb78d7bd239a45eccf3777acabedf3eddb0301b26cfc07a44b5 files/digest-postgresql-libs-8.1.10 542
diff --git a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.0.14 b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.0.14
deleted file mode 100644
index ce9aab5..0000000
--- a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.0.14
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 ffaaa630db6613cedbe935edd85d2a98 postgresql-base-8.0.14.tar.bz2 7907547
-RMD160 4e1c627af447ef24ec343baa3121edd2427d9fa9 postgresql-base-8.0.14.tar.bz2 7907547
-SHA256 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e postgresql-base-8.0.14.tar.bz2 7907547
-MD5 6a6feb48ca70bf1e36e99bab1671b66d postgresql-opt-8.0.14.tar.bz2 134706
-RMD160 ff8773b373aa33f6c43f2d7cc3a56b4484197fc7 postgresql-opt-8.0.14.tar.bz2 134706
-SHA256 b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a postgresql-opt-8.0.14.tar.bz2 134706
diff --git a/dev-db/postgresql-libs/files/digest-postgresql-libs-8.0.15 b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.0.15
new file mode 100644
index 0000000..e7881b8
--- /dev/null
+++ b/dev-db/postgresql-libs/files/digest-postgresql-libs-8.0.15
@@ -0,0 +1,3 @@
+MD5 3ee548b3643e0a0a4b76493e81b336f3 postgresql-8.0.15.tar.bz2 11253897
+RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 postgresql-8.0.15.tar.bz2 11253897
+SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 postgresql-8.0.15.tar.bz2 11253897
diff --git a/dev-db/postgresql-libs/files/postgresql-8.0-common.patch b/dev-db/postgresql-libs/files/postgresql-8.0-common.patch
new file mode 100644
index 0000000..40932ec
--- /dev/null
+++ b/dev-db/postgresql-libs/files/postgresql-8.0-common.patch
@@ -0,0 +1,76 @@
+diff --git a/config/programs.m4 b/config/programs.m4
+index 3f87396..9c7fbf0 100644
+--- a/config/programs.m4
++++ b/config/programs.m4
+@@ -153,13 +153,13 @@ 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'
+-  if test x"$prefix" = x"NONE"; then
+-    exp_localedir="$ac_default_prefix/share/locale"
+-  else
+-    exp_localedir="$prefix/share/locale"
+-  fi
++  # 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' ]
++  )
++  exp_localedir="${localedir}"
+ 
+   AC_SUBST(localedir)
+   AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index c71b175..674036a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [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-2005, 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 0c2dff0..d548d4d 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -239,6 +239,31 @@ 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__)
+ #define HAS_TEST_AND_SET
+ 
diff --git a/dev-db/postgresql-libs/files/postgresql-8.0-libs.patch b/dev-db/postgresql-libs/files/postgresql-8.0-libs.patch
index fa4cc70..ba9ed64 100644
--- a/dev-db/postgresql-libs/files/postgresql-8.0-libs.patch
+++ b/dev-db/postgresql-libs/files/postgresql-8.0-libs.patch
@@ -53,7 +53,7 @@ index 2bbdc8e..79aabf1 100644
  
  ifneq ($(PORTNAME), cygwin)
  ifneq ($(PORTNAME), win32)
-@@ -104,8 +104,7 @@ # Parallel make trickery
+@@ -104,8 +104,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.0-nls.patch b/dev-db/postgresql-libs/files/postgresql-8.0-nls.patch
deleted file mode 100644
index dabc966..0000000
--- a/dev-db/postgresql-libs/files/postgresql-8.0-nls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index 3f87396..9c7fbf0 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -153,13 +153,13 @@ 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'
--  if test x"$prefix" = x"NONE"; then
--    exp_localedir="$ac_default_prefix/share/locale"
--  else
--    exp_localedir="$prefix/share/locale"
--  fi
-+  # 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' ]
-+  )
-+  exp_localedir="${localedir}"
- 
-   AC_SUBST(localedir)
-   AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
diff --git a/dev-db/postgresql-libs/files/postgresql-8.0-sh-spinlocks.patch b/dev-db/postgresql-libs/files/postgresql-8.0-sh-spinlocks.patch
deleted file mode 100644
index 9856f38..0000000
--- a/dev-db/postgresql-libs/files/postgresql-8.0-sh-spinlocks.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
-index 0c2dff0..d548d4d 100644
---- a/src/include/storage/s_lock.h
-+++ b/src/include/storage/s_lock.h
-@@ -239,6 +239,31 @@ 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__)
- #define HAS_TEST_AND_SET
- 
diff --git a/dev-db/postgresql-libs/postgresql-libs-8.0.14.ebuild b/dev-db/postgresql-libs/postgresql-libs-8.0.15.ebuild
index ff59c1a..4f9451c 100644
--- a/dev-db/postgresql-libs/postgresql-libs-8.0.14.ebuild
+++ b/dev-db/postgresql-libs/postgresql-libs-8.0.15.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-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_/'
@@ -46,8 +45,7 @@ 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"
 
 	# to avoid collision - it only should be installed by server 
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 3eebdd3..0457ed1 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -30,22 +30,14 @@ AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da
 MD5 e70130009db4999da7c71240e01bab56 files/postgresql-7.4.19-autoconf.patch 1870
 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 files/postgresql-7.4.19-autoconf.patch 1870
 SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e files/postgresql-7.4.19-autoconf.patch 1870
-AUX postgresql-8.0-nls.patch 903 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af SHA1 f49df137be68a34b7f30e0c054df9f0e39721c22 SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98
-MD5 adfce07a45d624bc1903905090ffe431 files/postgresql-8.0-nls.patch 903
-RMD160 ffbe83748941a0d25715f6cfbadda95441d152af files/postgresql-8.0-nls.patch 903
-SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98 files/postgresql-8.0-nls.patch 903
-AUX postgresql-8.0-no-interfaces.patch 430 RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 SHA1 db70a0103d57bb2044f38fb0684328b80e365304 SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5
-MD5 486acb579010282ead6c424c6fb46ba1 files/postgresql-8.0-no-interfaces.patch 430
-RMD160 ffd1ad9591c887a8ccc4002067e604f7d8a59d28 files/postgresql-8.0-no-interfaces.patch 430
-SHA256 8707ff8105c3d9dccef95111becdc601eec0a161bd1aaf535b6cecd9a1f0cda5 files/postgresql-8.0-no-interfaces.patch 430
-AUX postgresql-8.0-regress.patch 3428 RMD160 a48909741d29be3d39d499fe73bd9fb898f93672 SHA1 cb232a1e9d642206a7c12876f9dc300b3016486b SHA256 fd9d4896d98cb77d8f58f9166505e232508236aa17a8cacdbd31595920743405
-MD5 97cff4347b56cda71ef090a296d0b2df files/postgresql-8.0-regress.patch 3428
-RMD160 a48909741d29be3d39d499fe73bd9fb898f93672 files/postgresql-8.0-regress.patch 3428
-SHA256 fd9d4896d98cb77d8f58f9166505e232508236aa17a8cacdbd31595920743405 files/postgresql-8.0-regress.patch 3428
-AUX postgresql-8.0-server.patch 2783 RMD160 4e46849355c146c65e98bc35c8744d95b05025ab SHA1 9461b0e2a8fdc98eb3cc3294ed59f2aa6f302009 SHA256 423aca5a8c5298b1f0ee8ac5765d6e957c1e6a99d7f9ee4252668f6e5d661f5e
-MD5 c885d8a900af4577b5f393e2c33a5154 files/postgresql-8.0-server.patch 2783
-RMD160 4e46849355c146c65e98bc35c8744d95b05025ab files/postgresql-8.0-server.patch 2783
-SHA256 423aca5a8c5298b1f0ee8ac5765d6e957c1e6a99d7f9ee4252668f6e5d661f5e files/postgresql-8.0-server.patch 2783
+AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
+MD5 bac29f949dff50568abc3b298d2402d6 files/postgresql-8.0-common.patch 2294
+RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 files/postgresql-8.0-common.patch 2294
+SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681 files/postgresql-8.0-common.patch 2294
+AUX postgresql-8.0-server.patch 6585 RMD160 2ca5906bd037fa04bab36d4536ee1c1bc7777b99 SHA1 3e2b9e0eff38eb02a84e373808c5b94bf91f761d SHA256 8e956e5f483da78b341dd3b4faecfa4eb6506716b01f8a3bdc283c67ca0a9daf
+MD5 1b28c1af55dea12052d350a9e0746485 files/postgresql-8.0-server.patch 6585
+RMD160 2ca5906bd037fa04bab36d4536ee1c1bc7777b99 files/postgresql-8.0-server.patch 6585
+SHA256 8e956e5f483da78b341dd3b4faecfa4eb6506716b01f8a3bdc283c67ca0a9daf files/postgresql-8.0-server.patch 6585
 AUX postgresql-8.1-nls.patch 903 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af SHA1 f49df137be68a34b7f30e0c054df9f0e39721c22 SHA256 363cc1db8d7425022dd35fb46933e9782e503e66480fefa1cb8c862450e82a98
 MD5 adfce07a45d624bc1903905090ffe431 files/postgresql-8.1-nls.patch 903
 RMD160 ffbe83748941a0d25715f6cfbadda95441d152af files/postgresql-8.1-nls.patch 903
@@ -144,15 +136,13 @@ RMD160 36441e4742f7b2af7178ac9b4e62cdf8c7f35446 files/postgresql.init-8.3 1574
 SHA256 a584384a8e041668b3162be21da7894f16e35c07845122b31d6709b6dcdb4f2b files/postgresql.init-8.3 1574
 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-base-8.0.14.tar.bz2 7907547 RMD160 4e1c627af447ef24ec343baa3121edd2427d9fa9 SHA1 55880d8e398faffb4a88e808a3dca2cef77b1b79 SHA256 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e
+DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 DIST postgresql-base-8.1.10.tar.bz2 8110015 RMD160 473e1c66ccc9d4ec47b01b03dff7951749afc785 SHA1 6d4c53d9946386d44f6ee33a9f76d92e00fc1f9c SHA256 c49b8b094838024ef09d1e574181c409dbc3bb13c8470ae495e74a0185aed981
 DIST postgresql-base-8.2.5.tar.bz2 8602348 RMD160 784924608f8bad40d079b3f54a75d98ea302ac34 SHA1 437b5e0144485be16557cbb3d48102063e7df69d SHA256 b70a2cc0d0613944ce0eae99c1001894354b77e81c8ae45f6c8c890709861929
 DIST postgresql-base-8.3beta2.tar.bz2 9587997 RMD160 d23f720a25e92bd15e6a12c5b36bdc447c096432 SHA1 cab5a2d93fe87783800683d22719717152dddc17 SHA256 b11595e1f51b3b0d6edf0d52ce6355b20384422c65a90558a1310c277f627e91
-DIST postgresql-opt-8.0.14.tar.bz2 134706 RMD160 ff8773b373aa33f6c43f2d7cc3a56b4484197fc7 SHA1 359127fba3130e46309b24f019eea0fb278ea033 SHA256 b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a
 DIST postgresql-opt-8.1.10.tar.bz2 144584 RMD160 fd9f11216465513494320b43fe27614c01b98e98 SHA1 d316b1a3b2a8f766ecf871537cf5d8067232a978 SHA256 9c99a8c31515107e29201e2ba1c5362871851b54bcf6bb9a5d3f81848196834f
 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.0.14.tar.bz2 935168 RMD160 109af78285a2309210a88cc270ca10264d1b5d39 SHA1 9ea2a05bd25ecbcfc0443424d60fe31b9e5bf121 SHA256 a228576902ea273aff6ee1f7bd7e4bd5d5b6d0b9bbb532aec1c83d5a6beb5a6e
 DIST postgresql-test-8.1.10.tar.bz2 948352 RMD160 8c25d16ace091dda2fcec5d39c9199d9829e91e9 SHA1 a1ba7e1b845eb05e5d24b22fe2ab5beafe39b22a SHA256 d887a18cade52167c0390fa7270bf86e33d95cba34d2ac3f755e13a1360d9de8
 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
@@ -164,10 +154,10 @@ EBUILD postgresql-server-7.4.19.ebuild 8019 RMD160 d8de543d6fd2b195a7c4937e5d5f6
 MD5 0960803de5a259080af6468c389670d2 postgresql-server-7.4.19.ebuild 8019
 RMD160 d8de543d6fd2b195a7c4937e5d5f6dd22e2af6ed postgresql-server-7.4.19.ebuild 8019
 SHA256 657d7db1e8442705f776574dcbb4ddc4c96122f24b8fb46298199e848c2ee5ce postgresql-server-7.4.19.ebuild 8019
-EBUILD postgresql-server-8.0.14.ebuild 8283 RMD160 c2ca20caf8b62e4819844ad99efdee5766837e25 SHA1 07898efcf37d16564a5438aa783a6c40739286a3 SHA256 0d892efec2569fca671de1ab01988396757ab7c3f23d8cd5469ee8fb8e6009ea
-MD5 c133f67b7a6702bea59ba1f9a68e9a21 postgresql-server-8.0.14.ebuild 8283
-RMD160 c2ca20caf8b62e4819844ad99efdee5766837e25 postgresql-server-8.0.14.ebuild 8283
-SHA256 0d892efec2569fca671de1ab01988396757ab7c3f23d8cd5469ee8fb8e6009ea postgresql-server-8.0.14.ebuild 8283
+EBUILD postgresql-server-8.0.15.ebuild 8023 RMD160 746eecd846357cbd20d25acac27dcc357c889a7f SHA1 8cc63df0bad03c0f434bb11767011f1883f0b4e4 SHA256 194bc89e54a1d968a0b72ae39e48525183a474a39f3bd94fa7ba298f2ee991fb
+MD5 acbde9ab1685db59447e5ffc23826e86 postgresql-server-8.0.15.ebuild 8023
+RMD160 746eecd846357cbd20d25acac27dcc357c889a7f postgresql-server-8.0.15.ebuild 8023
+SHA256 194bc89e54a1d968a0b72ae39e48525183a474a39f3bd94fa7ba298f2ee991fb postgresql-server-8.0.15.ebuild 8023
 EBUILD postgresql-server-8.1.10.ebuild 8500 RMD160 6f2a5d70bbcb1453afef9549efaf05723a214640 SHA1 71cab3000a003d299932d2222c897d2a6c45a1eb SHA256 6f07ca6892962a4a218fe63f5d9b945fce9750c368a131faaeba0128b7953992
 MD5 72a760179827e7c81ff6fcf003705727 postgresql-server-8.1.10.ebuild 8500
 RMD160 6f2a5d70bbcb1453afef9549efaf05723a214640 postgresql-server-8.1.10.ebuild 8500
@@ -190,9 +180,9 @@ SHA256 4a09b60d4700c7feb998b1d07118eab0b930bee7a325ab3a138246c2c7e86ec6 files/di
 MD5 d98b405b951efbaa919ed890118f3262 files/digest-postgresql-server-7.4.19 262
 RMD160 fa3e756851fbf3b72ea22b402837260263e6371c files/digest-postgresql-server-7.4.19 262
 SHA256 e68f25453b492b1b956e0fe7a6511d375befb38d43a3a456f52db0af80b6c18a files/digest-postgresql-server-7.4.19 262
-MD5 1358b88297b2a62e89ae6b0f3f8e75f3 files/digest-postgresql-server-8.0.14 813
-RMD160 6b804838d6313ac9eeba056fa585121d182d153f files/digest-postgresql-server-8.0.14 813
-SHA256 a1baf78455011d6b55b6faea5cb33acbc7ad760a9d6be761008fb1666b1467a1 files/digest-postgresql-server-8.0.14 813
+MD5 e0438519efec2797b6430212965d56eb files/digest-postgresql-server-8.0.15 262
+RMD160 1ad7b4f3a03631b3b6dbcf2fcf75bd8b3facb344 files/digest-postgresql-server-8.0.15 262
+SHA256 b7dedc99319f205c529bfc325277f1df69e4b605c49772db743936f31945f11f files/digest-postgresql-server-8.0.15 262
 MD5 c1f5dc79e4c3b485d10520cef4e58bbd files/digest-postgresql-server-8.1.10 813
 RMD160 e3d048bb15e556cb280308b7ad16c4ded7bf2d42 files/digest-postgresql-server-8.1.10 813
 SHA256 74756810f7e194f4b5ad4f2509d539555354821e1923863fb392068e34a919b2 files/digest-postgresql-server-8.1.10 813
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.0.14 b/dev-db/postgresql-server/files/digest-postgresql-server-8.0.14
deleted file mode 100644
index bf6c278..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.0.14
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 ffaaa630db6613cedbe935edd85d2a98 postgresql-base-8.0.14.tar.bz2 7907547
-RMD160 4e1c627af447ef24ec343baa3121edd2427d9fa9 postgresql-base-8.0.14.tar.bz2 7907547
-SHA256 8201ce5a99051c2b561f4b58ce07f17fe4959383ef38afcb25ab802119f9755e postgresql-base-8.0.14.tar.bz2 7907547
-MD5 6a6feb48ca70bf1e36e99bab1671b66d postgresql-opt-8.0.14.tar.bz2 134706
-RMD160 ff8773b373aa33f6c43f2d7cc3a56b4484197fc7 postgresql-opt-8.0.14.tar.bz2 134706
-SHA256 b097922bb346c039dc605b45927dca2916394d587000d5412b30c9ca5a1c117a postgresql-opt-8.0.14.tar.bz2 134706
-MD5 fd66be583db9d5b38d0822b9a9a027b0 postgresql-test-8.0.14.tar.bz2 935168
-RMD160 109af78285a2309210a88cc270ca10264d1b5d39 postgresql-test-8.0.14.tar.bz2 935168
-SHA256 a228576902ea273aff6ee1f7bd7e4bd5d5b6d0b9bbb532aec1c83d5a6beb5a6e postgresql-test-8.0.14.tar.bz2 935168
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.0.15 b/dev-db/postgresql-server/files/digest-postgresql-server-8.0.15
new file mode 100644
index 0000000..e7881b8
--- /dev/null
+++ b/dev-db/postgresql-server/files/digest-postgresql-server-8.0.15
@@ -0,0 +1,3 @@
+MD5 3ee548b3643e0a0a4b76493e81b336f3 postgresql-8.0.15.tar.bz2 11253897
+RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 postgresql-8.0.15.tar.bz2 11253897
+SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 postgresql-8.0.15.tar.bz2 11253897
diff --git a/dev-db/postgresql-server/files/postgresql-8.0-common.patch b/dev-db/postgresql-server/files/postgresql-8.0-common.patch
new file mode 100644
index 0000000..40932ec
--- /dev/null
+++ b/dev-db/postgresql-server/files/postgresql-8.0-common.patch
@@ -0,0 +1,76 @@
+diff --git a/config/programs.m4 b/config/programs.m4
+index 3f87396..9c7fbf0 100644
+--- a/config/programs.m4
++++ b/config/programs.m4
+@@ -153,13 +153,13 @@ 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'
+-  if test x"$prefix" = x"NONE"; then
+-    exp_localedir="$ac_default_prefix/share/locale"
+-  else
+-    exp_localedir="$prefix/share/locale"
+-  fi
++  # 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' ]
++  )
++  exp_localedir="${localedir}"
+ 
+   AC_SUBST(localedir)
+   AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
+diff --git a/configure.in b/configure.in
+index c71b175..674036a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
+ 
+ AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [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-2005, 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 0c2dff0..d548d4d 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -239,6 +239,31 @@ 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__)
+ #define HAS_TEST_AND_SET
+ 
diff --git a/dev-db/postgresql-server/files/postgresql-8.0-nls.patch b/dev-db/postgresql-server/files/postgresql-8.0-nls.patch
deleted file mode 100644
index dabc966..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.0-nls.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/config/programs.m4 b/config/programs.m4
-index 3f87396..9c7fbf0 100644
---- a/config/programs.m4
-+++ b/config/programs.m4
-@@ -153,13 +153,13 @@ 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'
--  if test x"$prefix" = x"NONE"; then
--    exp_localedir="$ac_default_prefix/share/locale"
--  else
--    exp_localedir="$prefix/share/locale"
--  fi
-+  # 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' ]
-+  )
-+  exp_localedir="${localedir}"
- 
-   AC_SUBST(localedir)
-   AC_DEFINE_UNQUOTED(LOCALEDIR, ["$exp_localedir"],
diff --git a/dev-db/postgresql-server/files/postgresql-8.0-no-interfaces.patch b/dev-db/postgresql-server/files/postgresql-8.0-no-interfaces.patch
deleted file mode 100644
index 897388e..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.0-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.0-regress.patch b/dev-db/postgresql-server/files/postgresql-8.0-regress.patch
deleted file mode 100644
index 3cc0fdd..0000000
--- a/dev-db/postgresql-server/files/postgresql-8.0-regress.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 822147b..f45ddee 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -138,7 +138,8 @@ ##
- check: all
- 	-rm -rf ./testtablespace
- 	mkdir ./testtablespace
--	$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)
-+	chown portage testtablespace .
-+	su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin/ PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)"
- 
- installcheck: all
- 	-rm -rf ./testtablespace
-diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
-index d62afdd..e41319c 100644
---- a/src/test/regress/pg_regress.sh
-+++ b/src/test/regress/pg_regress.sh
-@@ -89,6 +89,8 @@ host_platform='@host_tuple@'
- enable_shared='@enable_shared@'
- GCC=@GCC@
- 
-+test -z "${clientbindir}" && clientbindir="${bindir}"
-+
- if [ "$GCC" = yes ]; then
-     compiler=gcc
- else
-@@ -446,7 +448,7 @@ then
-     # wait forever, however.
-     i=0
-     max=60
--    until "$bindir/psql" -X $psql_options template1 </dev/null 2>/dev/null
-+    until "$clientbindir/psql" -X $psql_options template1 </dev/null 2>/dev/null
-     do
-         i=`expr $i + 1`
-         if [ $i -ge $max ]
-@@ -503,7 +505,7 @@ else # not temp-install
-     fi
- 
-     message "dropping database \"$dbname\""
--    "$bindir/dropdb" $psql_options "$dbname"
-+    "$clientbindir/dropdb" $psql_options "$dbname"
-     # errors can be ignored
- fi
- 
-@@ -512,7 +514,7 @@ # ----------
- # Set up SQL shell for the test.
- # ----------
- 
--PSQL="$bindir/psql -a -q -X $psql_options"
-+PSQL="$clientbindir/psql -a -q -X $psql_options"
- 
- 
- # ----------
-@@ -546,13 +548,13 @@ # remove the core file.
- # ----------
- 
- message "creating database \"$dbname\""
--"$bindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
-+"$clientbindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
- if [ $? -ne 0 ]; then
-     echo "$me: createdb failed"
-     (exit 2); exit
- fi
- 
--"$bindir/psql" -q -X $psql_options -c "\
-+"$clientbindir/psql" -q -X $psql_options -c "\
- checkpoint;
- alter database \"$dbname\" set lc_messages to 'C';
- alter database \"$dbname\" set lc_monetary to 'C';
-@@ -569,7 +571,7 @@ # Remove regressuser* and regressgroup* 
- # ----------
- 
- message "dropping regression test user accounts"
--"$bindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
-+"$clientbindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
- if [ $? -eq 2 ]; then
-     echo "$me: could not drop user accounts"
-     (exit 2); exit
-@@ -582,7 +584,7 @@ # ----------
- 
- if [ "$enable_shared" = yes ]; then
-         message "installing PL/pgSQL"
--        "$bindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname
-+        "$clientbindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname
-         if [ $? -ne 0 ] && [ $? -ne 2 ]; then
-             echo "$me: createlang failed"
-             (exit 2); exit
diff --git a/dev-db/postgresql-server/files/postgresql-8.0-server.patch b/dev-db/postgresql-server/files/postgresql-8.0-server.patch
index 3fcfe27..72e37eb 100644
--- a/dev-db/postgresql-server/files/postgresql-8.0-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.0-server.patch
@@ -2,7 +2,7 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in
 index c451bd6..a048ce7 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
@@ -62,7 +62,7 @@ diff --git a/src/Makefile b/src/Makefile
 index 0963f88..5a7bb45 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -18,14 +18,10 @@ all install installdirs uninstall dep de
+@@ -18,14 +18,10 @@ all install installdirs uninstall dep depend distprep:
  	$(MAKE) -C timezone $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -78,6 +78,23 @@ index 0963f88..5a7bb45 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 e57265e..e081618 100644
+--- a/src/Makefile.global.in
++++ b/src/Makefile.global.in
+@@ -336,10 +336,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 8309db1..0d620d0 100644
 --- a/src/bin/Makefile
@@ -111,3 +128,91 @@ index de686e7..3bddb0e 100644
  
  uninstall:
  	$(RM) $(DESTDIR)$(libdir)/libpgport.a
+diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
+index 822147b..f45ddee 100644
+--- a/src/test/regress/GNUmakefile
++++ b/src/test/regress/GNUmakefile
+@@ -138,7 +138,8 @@ all-spi:
+ check: all
+ 	-rm -rf ./testtablespace
+ 	mkdir ./testtablespace
+-	$(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)
++	chown portage testtablespace .
++	su -s /bin/sh portage -c "clientbindir=/usr/lib/postgresql-${SLOT}/bin/ PATH=\"${PATH}\" $(SHELL) ./pg_regress --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) $(MAXCONNOPT) $(NOLOCALE)"
+ 
+ installcheck: all
+ 	-rm -rf ./testtablespace
+diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
+index d62afdd..e41319c 100644
+--- a/src/test/regress/pg_regress.sh
++++ b/src/test/regress/pg_regress.sh
+@@ -89,6 +89,8 @@ host_platform='@host_tuple@'
+ enable_shared='@enable_shared@'
+ GCC=@GCC@
+ 
++test -z "${clientbindir}" && clientbindir="${bindir}"
++
+ if [ "$GCC" = yes ]; then
+     compiler=gcc
+ else
+@@ -446,7 +448,7 @@ then
+     # wait forever, however.
+     i=0
+     max=60
+-    until "$bindir/psql" -X $psql_options template1 </dev/null 2>/dev/null
++    until "$clientbindir/psql" -X $psql_options template1 </dev/null 2>/dev/null
+     do
+         i=`expr $i + 1`
+         if [ $i -ge $max ]
+@@ -503,7 +505,7 @@ else # not temp-install
+     fi
+ 
+     message "dropping database \"$dbname\""
+-    "$bindir/dropdb" $psql_options "$dbname"
++    "$clientbindir/dropdb" $psql_options "$dbname"
+     # errors can be ignored
+ fi
+ 
+@@ -512,7 +514,7 @@ fi
+ # Set up SQL shell for the test.
+ # ----------
+ 
+-PSQL="$bindir/psql -a -q -X $psql_options"
++PSQL="$clientbindir/psql -a -q -X $psql_options"
+ 
+ 
+ # ----------
+@@ -546,13 +548,13 @@ fi
+ # ----------
+ 
+ message "creating database \"$dbname\""
+-"$bindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
++"$clientbindir/createdb" $encoding_opt $psql_options --template template0 "$dbname"
+ if [ $? -ne 0 ]; then
+     echo "$me: createdb failed"
+     (exit 2); exit
+ fi
+ 
+-"$bindir/psql" -q -X $psql_options -c "\
++"$clientbindir/psql" -q -X $psql_options -c "\
+ checkpoint;
+ alter database \"$dbname\" set lc_messages to 'C';
+ alter database \"$dbname\" set lc_monetary to 'C';
+@@ -569,7 +571,7 @@ fi
+ # ----------
+ 
+ message "dropping regression test user accounts"
+-"$bindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
++"$clientbindir/psql" -q -X $psql_options -c 'DROP GROUP regressgroup1; DROP GROUP regressgroup2; DROP USER regressuser1, regressuser2, regressuser3, regressuser4;' $dbname 2>/dev/null
+ if [ $? -eq 2 ]; then
+     echo "$me: could not drop user accounts"
+     (exit 2); exit
+@@ -582,7 +584,7 @@ fi
+ 
+ if [ "$enable_shared" = yes ]; then
+         message "installing PL/pgSQL"
+-        "$bindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname
++        "$clientbindir/createlang" -L "$pkglibdir" $psql_options plpgsql $dbname
+         if [ $? -ne 0 ] && [ $? -ne 2 ]; then
+             echo "$me: createlang failed"
+             (exit 2); exit
diff --git a/dev-db/postgresql-server/postgresql-server-8.0.14.ebuild b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
index 78858b1..6b4291b 100644
--- a/dev-db/postgresql-server/postgresql-server-8.0.14.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.0.15.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,12 +63,10 @@ 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
 	fi
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index af6e618..149e861 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -6,10 +6,10 @@ EBUILD postgresql-7.4.19.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54
 MD5 20abcea6f4619fcd39aa399905b4146d postgresql-7.4.19.ebuild 1012
 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-7.4.19.ebuild 1012
 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6 postgresql-7.4.19.ebuild 1012
-EBUILD postgresql-8.0.14.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f SHA1 a74f359d746918f45eb28784abb595d7f3bcb7d3 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6
-MD5 20abcea6f4619fcd39aa399905b4146d postgresql-8.0.14.ebuild 1012
-RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-8.0.14.ebuild 1012
-SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6 postgresql-8.0.14.ebuild 1012
+EBUILD postgresql-8.0.15.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f SHA1 a74f359d746918f45eb28784abb595d7f3bcb7d3 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6
+MD5 20abcea6f4619fcd39aa399905b4146d postgresql-8.0.15.ebuild 1012
+RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-8.0.15.ebuild 1012
+SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6 postgresql-8.0.15.ebuild 1012
 EBUILD postgresql-8.1.10.ebuild 1012 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f SHA1 a74f359d746918f45eb28784abb595d7f3bcb7d3 SHA256 3a5e11bab6c9deb6b804c72ef0e51c3060339c30e99e9d1b7fc0e1d5735591e6
 MD5 20abcea6f4619fcd39aa399905b4146d postgresql-8.1.10.ebuild 1012
 RMD160 d9a19ee9beccaf94d1d7565d4c9cbb7d5d54109f postgresql-8.1.10.ebuild 1012
@@ -32,9 +32,9 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-7.4.19 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-7.4.19 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-7.4.19 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-8.0.14 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-8.0.14 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-8.0.14 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-8.0.15 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-8.0.15 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-8.0.15 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-postgresql-8.1.10 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-postgresql-8.1.10 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-postgresql-8.1.10 0
diff --git a/dev-db/postgresql/files/digest-postgresql-8.0.14 b/dev-db/postgresql/files/digest-postgresql-8.0.15
index e69de29..e69de29 100644
--- a/dev-db/postgresql/files/digest-postgresql-8.0.14
+++ b/dev-db/postgresql/files/digest-postgresql-8.0.15
diff --git a/dev-db/postgresql/postgresql-8.0.14.ebuild b/dev-db/postgresql/postgresql-8.0.15.ebuild
index 4a526fd..4a526fd 100644
--- a/dev-db/postgresql/postgresql-8.0.14.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.15.ebuild