* bump, closing bug #157337

Package-Manager: portage-2.1.2.5

6 files changed, 162 insertions, 0 deletions

diff --git a/dev-db/postgresql/files/digest-postgresql-8.2.4 b/dev-db/postgresql/files/digest-postgresql-8.2.4
new file mode 100644
index 000000000000..6035a30b4e46
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-8.2.4
@@ -0,0 +1,12 @@
+MD5 5c0576627c9969a3cedb6b014fb6ae05 postgresql-base-8.2.4.tar.bz2 8549159
+RMD160 876105c3cc9d36b66cf9dc9b687d4b6f6b2c3d9c postgresql-base-8.2.4.tar.bz2 8549159
+SHA256 8ee5ad364ee21079ce3d726b4abcfa0f318015a331e37e9856a3500fcce74cca postgresql-base-8.2.4.tar.bz2 8549159
+MD5 7d520a0fc88c8b59338c25cf18331f6a postgresql-docs-8.2.4.tar.bz2 2769630
+RMD160 bcdb176f509f69141524ababa0f6c9b1a1dd5c3f postgresql-docs-8.2.4.tar.bz2 2769630
+SHA256 2bb5bea974a68f562e40104d756ea87dbd831cf8fbd4bb54faca38f23c87de4c postgresql-docs-8.2.4.tar.bz2 2769630
+MD5 b71b0526e7c8af22d82fbc7b6f81a750 postgresql-opt-8.2.4.tar.bz2 167612
+RMD160 aaacb743be86afbfe0f885b7994c15c94fef2413 postgresql-opt-8.2.4.tar.bz2 167612
+SHA256 5977ca1f0913aa98bc889e49b38768621865959b14e2674e7716d44b7fe9eb35 postgresql-opt-8.2.4.tar.bz2 167612
+MD5 0fefe28b8c9d16ebdf6f05c366477a9d postgresql-test-8.2.4.tar.bz2 985819
+RMD160 c5fcbef081565f7ba02fc4ac96ce8e1f4141c3ae postgresql-test-8.2.4.tar.bz2 985819
+SHA256 fc4471ecece04251289cfe7feb0acbafa3a18cf8f35c2d61ce3f68bd4394e504 postgresql-test-8.2.4.tar.bz2 985819
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch b/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch
new file mode 100644
index 000000000000..6d47d2535980
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.2.4-gentoo.patch
@@ -0,0 +1,58 @@
+--- postgresql-8.2.3.orig/src/bin/Makefile	2006-03-05 16:58:50.000000000 +0100
++++ postgresql-8.2.3/src/bin/Makefile	2007-03-29 12:12:26.000000000 +0200
+@@ -14,7 +14,7 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ DIRS := initdb ipcclean pg_ctl pg_dump \
+-	psql scripts pg_config pg_controldata pg_resetxlog
++	psql scripts pg_controldata pg_resetxlog
+ ifeq ($(PORTNAME), win32)
+ DIRS+=pgevent
+ endif
+--- postgresql-8.2.3.orig/src/interfaces/Makefile	2004-04-20 02:33:51.000000000 +0200
++++ postgresql-8.2.3/src/interfaces/Makefile	2007-03-29 12:14:01.000000000 +0200
+@@ -12,7 +12,7 @@
+ top_builddir = ../..
+ include $(top_builddir)/src/Makefile.global
+ 
+-DIRS := libpq ecpg 
++DIRS := ecpg 
+ 
+ ALLDIRS := $(DIRS) 
+
+--- postgresql-8.2.3.orig/src/Makefile	2006-06-23 01:50:35.000000000 +0200
++++ postgresql-8.2.3/src/Makefile	2007-03-29 12:54:59.000000000 +0200
+@@ -18,12 +18,10 @@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+ 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+ 	$(MAKE) -C makefiles $@
+-	$(MAKE) -C test/regress $@
+ 
+ install: install-local
+ 
+@@ -47,7 +45,6 @@
+ 	$(MAKE) -C port $@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -60,12 +57,10 @@
+ 	-$(MAKE) -C port $@
+ 	-$(MAKE) -C timezone $@
+ 	-$(MAKE) -C backend $@
+-	-$(MAKE) -C include $@
+ 	-$(MAKE) -C interfaces $@
+ 	-$(MAKE) -C bin $@
+ 	-$(MAKE) -C pl $@
+ 	-$(MAKE) -C makefiles $@
+-	-$(MAKE) -C test $@
+ 	-$(MAKE) -C tutorial NO_PGXS=1 $@
+ 	-$(MAKE) -C test/thread $@
+ 	rm -f Makefile.port Makefile.global
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch b/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch
new file mode 100644
index 000000000000..0f887e28d22c
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.2.4-no-test.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Makefile b/src/Makefile
+index 5eb7c4a..0f9fff0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -22,7 +22,6 @@ all install installdirs uninstall dep de
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+ 	$(MAKE) -C makefiles $@
+-	$(MAKE) -C test/regress $@
+ 
+ install: install-local
+ 
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch b/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch
new file mode 100644
index 000000000000..0af8c3fbfd80
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.2.4-regress_fix.patch
@@ -0,0 +1,31 @@
+diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out
+index f7c35de..183a963 100644
+--- a/src/test/regress/expected/interval.out
++++ b/src/test/regress/expected/interval.out
+@@ -293,12 +293,6 @@ (10 rows)
+ -- test avg(interval), which is somewhat fragile since people have been
+ -- known to change the allowed input syntax for type interval without
+ -- updating pg_aggregate.agginitval
+-select avg(f1) from interval_tbl;
+-                       avg                       
+--------------------------------------------------
+- @ 4 years 1 mon 10 days 4 hours 18 mins 23 secs
+-(1 row)
+-
+ -- test long interval input
+ select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
+                   interval                  
+diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql
+index 9b2e625..cb44d12 100644
+--- a/src/test/regress/sql/interval.sql
++++ b/src/test/regress/sql/interval.sql
+@@ -101,9 +101,6 @@ SELECT '' AS ten, * FROM INTERVAL_TBL;
+ -- test avg(interval), which is somewhat fragile since people have been
+ -- known to change the allowed input syntax for type interval without
+ -- updating pg_aggregate.agginitval
+-
+-select avg(f1) from interval_tbl;
+-
+ -- test long interval input
+ select '4 millenniums 5 centuries 4 decades 1 year 4 months 4 days 17 minutes 31 seconds'::interval;
+ 
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch b/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch
new file mode 100644
index 000000000000..83c56d7ab100
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.2.4-regress_su.patch
@@ -0,0 +1,15 @@
+diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
+index f2319d2..b14a6f0 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 "./pg_regress --psqldir=`pwd`/../../bin/psql --temp-install=./tmp_check --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --schedule=$(srcdir)/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE)"
+ 
+ installcheck: all
+ 	-rm -rf ./testtablespace
+diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
diff --git a/dev-db/postgresql/files/postgresql-8.2.4-sh.patch b/dev-db/postgresql/files/postgresql-8.2.4-sh.patch
new file mode 100644
index 000000000000..295bb6cfb600
--- /dev/null
+++ b/dev-db/postgresql/files/postgresql-8.2.4-sh.patch
@@ -0,0 +1,34 @@
+--- postgresql-8.2.3.orig/src/include/storage/s_lock.h	2006-06-08 00:24:45.000000000 +0200
++++ postgresql-8.2.3/src/include/storage/s_lock.h	2007-03-29 12:25:56.000000000 +0200
+@@ -299,6 +299,31 @@
+ #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
+